js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Replace MORPHOS_LIB with more generic AMIGA_LIB

Browse source
This commit is contained in:
Jonathan Schleifer 2018-04-29 01:39:09 +02:00
parent a44616d977
commit 3c3a971059
No known key found for this signature in database
GPG key ID: D83A76BFE376345E
2 changed files with 53 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

83
buildsys.mk.in
View file

@ -56,6 +56,7 @@ LIB_LDFLAGS = @LIB_LDFLAGS@
LIB_LDFLAGS_INSTALL_NAME = @LIB_LDFLAGS_INSTALL_NAME@ LIB_LDFLAGS_INSTALL_NAME = @LIB_LDFLAGS_INSTALL_NAME@
LIB_PREFIX = @LIB_PREFIX@ LIB_PREFIX = @LIB_PREFIX@
LIB_SUFFIX = @LIB_SUFFIX@ LIB_SUFFIX = @LIB_SUFFIX@
AMIGALIB_CFLAGS = @AMIGALIB_CFLAGS@
PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
@ -108,21 +109,21 @@ OBJS11 = ${OBJS10:.S=.o}
OBJS += ${OBJS11:.xpm=.o} OBJS += ${OBJS11:.xpm=.o}
LIB_OBJS = ${OBJS:.o=.lib.o} LIB_OBJS = ${OBJS:.o=.lib.o}
MORPHOS_LIB_OBJS = ${OBJS:.o=.moslib.o} AMIGA_LIB_OBJS = ${OBJS:.o=.amigalib.o}
PLUGIN_OBJS = ${OBJS:.o=.plugin.o} PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
MO_FILES = ${LOCALES:.po=.mo} MO_FILES = ${LOCALES:.po=.mo}
.SILENT: .SILENT:
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm .SUFFIXES: .amigalib.o .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER} .PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER}
all: all:
${MAKE} pre-all ${MAKE} pre-all
${MAKE} subdirs ${MAKE} subdirs
${MAKE} depend ${MAKE} depend
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${MORPHOS_LIB} ${MORPHOS_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales ${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
${MAKE} subdirs-after ${MAKE} subdirs-after
${MAKE} post-all ${MAKE} post-all
@ -192,27 +193,27 @@ depend: pre-depend ${SRCS}
.c.c.dep: .c.c.dep:
${CPP} ${CPPFLAGS} ${CFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${CFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.amigalib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
.cc.cc.dep .cxx.cxx.dep: .cc.cc.dep .cxx.cxx.dep:
${CPP} ${CPPFLAGS} ${CXXFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${CXXFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.amigalib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
.m.m.dep: .m.m.dep:
${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.amigalib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
.mm.mm.dep: .mm.mm.dep:
${CPP} ${CPPFLAGS} ${OBJCXXFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.amigalib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
.S.S.dep: .S.S.dep:
${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.moslib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.amigalib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
pre-depend: pre-depend:
@ -277,9 +278,9 @@ copy-headers-into-framework:
done \ done \
fi fi
${MORPHOS_LIB} ${MORPHOS_LIB_NOINST}: ${EXT_DEPS} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA} ${AMIGA_LIB} ${AMIGA_LIB_NOINST}: ${EXT_DEPS} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
if ${LD} -o $@ ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA} -nostartfiles ${LDFLAGS} ${LIBS}; then \ if ${LD} -o $@ ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA} -nostartfiles ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
@ -409,14 +410,14 @@ locales: ${MO_FILES}
else \ else \
${COMPILE_LIB_FAILED}; \ ${COMPILE_LIB_FAILED}; \
fi fi
.c.moslib.o: .c.amigalib.o:
${COMPILE_MOSLIB_STATUS} ${COMPILE_AMIGALIB_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${CC} -mbaserel32 ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} -c -o $@ $<; then \ if ${CC} ${AMIGALIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} -c -o $@ $<; then \
${COMPILE_MOSLIB_OK}; \ ${COMPILE_AMIGALIB_OK}; \
else \ else \
${COMPILE_MOSLIB_FAILED}; \ ${COMPILE_AMIGALIB_FAILED}; \
fi fi
.c.plugin.o: .c.plugin.o:
${COMPILE_PLUGIN_STATUS} ${COMPILE_PLUGIN_STATUS}
@ -446,14 +447,14 @@ locales: ${MO_FILES}
else \ else \
${COMPILE_LIB_FAILED}; \ ${COMPILE_LIB_FAILED}; \
fi fi
.cc.moslib.o .cxx.moslib.o: .cc.amigalib.o .cxx.amigalib.o:
${COMPILE_MOSLIB_STATUS} ${COMPILE_AMIGALIB_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${CXX} -mbaserel32 ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$<} ${CXXFLAGS_$@} -c -o $@ $<; then \ if ${CXX} ${AMIGALIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$<} ${CXXFLAGS_$@} -c -o $@ $<; then \
${COMPILE_MOSLIB_OK}; \ ${COMPILE_AMIGALIB_OK}; \
else \ else \
${COMPILE_MOSLIB_FAILED}; \ ${COMPILE_AMIGALIB_FAILED}; \
fi fi
.cc.plugin.o .cxx.plugin.o: .cc.plugin.o .cxx.plugin.o:
${COMPILE_PLUGIN_STATUS} ${COMPILE_PLUGIN_STATUS}
@ -521,14 +522,14 @@ locales: ${MO_FILES}
else \ else \
${COMPILE_LIB_FAILED}; \ ${COMPILE_LIB_FAILED}; \
fi fi
.m.moslib.o: .m.amigalib.o:
${COMPILE_MOSLIB_STATUS} ${COMPILE_AMIGALIB_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${OBJC} -mbaserel32 ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$<} ${OBJCFLAGS_$@} -c -o $@ $<; then \ if ${OBJC} ${AMIGALIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$<} ${OBJCFLAGS_$@} -c -o $@ $<; then \
${COMPILE_MOSLIB_OK}; \ ${COMPILE_AMIGALIB_OK}; \
else \ else \
${COMPILE_MOSLIB_FAILED}; \ ${COMPILE_AMIGALIB_FAILED}; \
fi fi
.m.plugin.o: .m.plugin.o:
${COMPILE_PLUGIN_STATUS} ${COMPILE_PLUGIN_STATUS}
@ -558,14 +559,14 @@ locales: ${MO_FILES}
else \ else \
${COMPILE_LIB_FAILED}; \ ${COMPILE_LIB_FAILED}; \
fi fi
.mm.moslib.o: .mm.amigalib.o:
${COMPILE_MOSLIB_STATUS} ${COMPILE_AMIGALIB_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${OBJCXX} -mbaserel32 ${OBJCXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$<} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \ if ${OBJCXX} ${AMIGALIB_CFLAGS} ${OBJCXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$<} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
${COMPILE_MOSLIB_OK}; \ ${COMPILE_AMIGALIB_OK}; \
else \ else \
${COMPILE_MOSLIB_FAILED}; \ ${COMPILE_AMIGALIB_FAILED}; \
fi fi
.mm.plugin.o: .mm.plugin.o:
${COMPILE_PLUGIN_STATUS} ${COMPILE_PLUGIN_STATUS}
@ -607,7 +608,7 @@ locales: ${MO_FILES}
${COMPILE_FAILED}; \ ${COMPILE_FAILED}; \
fi fi
.S.o .S.moslib.o: .S.o .S.amigalib.o:
${COMPILE_STATUS} ${COMPILE_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
@ -653,14 +654,14 @@ locales: ${MO_FILES}
else \ else \
${COMPILE_LIB_FAILED}; \ ${COMPILE_LIB_FAILED}; \
fi fi
.xpm.moslib.o: .xpm.amigalib.o:
${COMPILE_MOSLIB_STATUS} ${COMPILE_AMIGALIB_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${CC} -mbasel32 ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} -x c -c -o $@ $<; then \ if ${CC} ${AMIGALIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} -x c -c -o $@ $<; then \
${COMPILE_MOSLIB_OK}; \ ${COMPILE_AMIGALIB_OK}; \
else \ else \
${COMPILE_MOSLIB_FAILED}; \ ${COMPILE_AMIGALIB_FAILED}; \
fi fi
.xpm.plugin.o: .xpm.plugin.o:
${COMPILE_PLUGIN_STATUS} ${COMPILE_PLUGIN_STATUS}
@ -898,7 +899,7 @@ clean:
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in "" ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${MORPHOS_LIB_OBJS} ${MORPHOS_LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${FRAMEWORK} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \ for i in "" ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${FRAMEWORK} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
test x"$$i" = x"" && continue; \ test x"$$i" = x"" && continue; \
if test -f $$i -o -d $$i; then \ if test -f $$i -o -d $$i; then \
if rm -fr $$i; then \ if rm -fr $$i; then \
@ -951,9 +952,9 @@ COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_
COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<" COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<"
COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<" COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<"
COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
COMPILE_MOSLIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (moslib)...@TERM_SGR0@\r" "$<" COMPILE_AMIGALIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (Amiga lib)...@TERM_SGR0@\r" "$<"
COMPILE_MOSLIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (moslib).@TERM_SGR0@\n" "$<" COMPILE_AMIGALIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (Amiga lib).@TERM_SGR0@\n" "$<"
COMPILE_MOSLIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (moslib)!@TERM_SGR0@\n" "$<"; exit $$err COMPILE_AMIGALIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (Amiga lib)!@TERM_SGR0@\n" "$<"; exit $$err
COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<" COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<"
COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<" COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<"
COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err

13
m4/buildsys.m4
View file

@ -36,6 +36,15 @@ AC_DEFUN([BUILDSYS_INIT], [
;; ;;
esac esac
case "$host" in
m68k-*-amigaos*)
AC_SUBST(AMIGALIB_CFLAGS, -fbaserel)
;;
powerpc-*-morphos*)
AC_SUBST(AMIGALIB_CFLAGS, -mbaserel32)
;;
esac
AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS_PRE([
AC_SUBST(CC_DEPENDS, $GCC) AC_SUBST(CC_DEPENDS, $GCC)
AC_SUBST(CXX_DEPENDS, $GXX) AC_SUBST(CXX_DEPENDS, $GXX)
@ -297,10 +306,10 @@ AC_DEFUN([BUILDSYS_FRAMEWORK], [
AC_REQUIRE([BUILDSYS_CHECK_IOS]) AC_REQUIRE([BUILDSYS_CHECK_IOS])
AC_REQUIRE([BUILDSYS_SHARED_LIB]) AC_REQUIRE([BUILDSYS_SHARED_LIB])
AC_CHECK_TOOL(CODESIGN, codesign)
case "$host_os" in case "$host_os" in
darwin*) darwin*)
AC_CHECK_TOOL(CODESIGN, codesign)
AS_IF([test x"$host_is_ios" = x"yes"], [ AS_IF([test x"$host_is_ios" = x"yes"], [
FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}' FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}' FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}'