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

Add OBJS_EXTRA and LIB_OBJS_EXTRA.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-03-14 10:02:48 +01:00
parent 0ac0a11410
commit 5645ee0c74
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
buildsys.mk.in
View file

@ -148,35 +148,35 @@ depend: pre-depend ${SRCS}
pre-depend: pre-depend:
${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
fi fi
${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
if test x"${JAR_MANIFEST}" != x""; then \ if test x"${JAR_MANIFEST}" != x""; then \
if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS}; then \ if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
fi \ fi \
else \ else \
if ${JAR} cf ${JARFILE} ${OBJS}; then \ if ${JAR} cf ${JARFILE} ${OBJS} ${OBJS_EXTRA}; then \
${LINK_OK}; \ ${LINK_OK}; \
else \ else \
${LINK_FAILED}; \ ${LINK_FAILED}; \
fi \ fi \
fi fi
${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS}; \ ${LINK_STATUS}; \
objs=""; \ objs=""; \
ars=""; \ ars=""; \
for i in ${LIB_OBJS}; do \ for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
case $$i in \ case $$i in \
*.a) \ *.a) \
ars="$$ars $$i" \ ars="$$ars $$i" \
@ -242,12 +242,12 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
rm -fr $$dir; \ rm -fr $$dir; \
done done
${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
rm -f $@ rm -f $@
objs=""; \ objs=""; \
ars=""; \ ars=""; \
for i in ${OBJS}; do \ for i in ${OBJS} ${OBJS_EXTRA}; do \
case $$i in \ case $$i in \
*.a) \ *.a) \
ars="$$ars $$i" \ ars="$$ars $$i" \
@ -279,12 +279,12 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS}
rm -fr $$dir; \ rm -fr $$dir; \
done done
${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
${LINK_STATUS} ${LINK_STATUS}
rm -f $@ rm -f $@
objs=""; \ objs=""; \
ars=""; \ ars=""; \
for i in ${LIB_OBJS}; do \ for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
case $$i in \ case $$i in \
*.a) \ *.a) \
ars="$$ars $$i" \ ars="$$ars $$i" \
@ -687,7 +687,7 @@ clean:
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${DEPS} ${OBJS} ${LIB_OBJS} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \ for i in ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${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} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
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 \
${DELETE_OK}; \ ${DELETE_OK}; \