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

Rename LIB to SHARED_LIB.

Browse source 
The reason is that the Intel compiler (and maybe others) set LIB in the
environment, this causing the buildsys to fail.
This commit is contained in:
Jonathan Schleifer 2011-09-13 02:31:26 +02:00
parent ba639801a2
commit e9743550ee
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
buildsys.mk.in
View file

@ -108,7 +108,7 @@ MO_FILES = ${LOCALES:.po=.mo}
all: all:
${MAKE} ${MFLAGS} subdirs ${MAKE} ${MFLAGS} subdirs
${MAKE} ${MFLAGS} depend ${MAKE} ${MFLAGS} depend
${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${LIB} ${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} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
subdirs: subdirs:
for i in ${SUBDIRS}; do \ for i in ${SUBDIRS}; do \
@ -172,7 +172,7 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS}
fi \ fi \
fi fi
${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS}
${LINK_STATUS}; \ ${LINK_STATUS}; \
if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ if ${LD} -o $@ ${LIB_OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
${LINK_OK}; \ ${LINK_OK}; \
@ -424,14 +424,14 @@ locales: ${MO_FILES}
${COMPILE_PLUGIN_FAILED}; \ ${COMPILE_PLUGIN_FAILED}; \
fi fi
install: ${LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra install: ${SHARED_LIB} ${STATIC_LIB} ${STATIC_PIC_LIB} ${PLUGIN} ${PROG} install-extra
for i in ${SUBDIRS}; do \ for i in ${SUBDIRS}; do \
${DIR_ENTER}; \ ${DIR_ENTER}; \
${MAKE} ${MFLAGS} install || exit 1; \ ${MAKE} ${MFLAGS} install || exit 1; \
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${LIB}; do \ for i in ${SHARED_LIB}; do \
${INSTALL_STATUS}; \ ${INSTALL_STATUS}; \
if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \ if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \
${INSTALL_OK}; \ ${INSTALL_OK}; \
@ -512,7 +512,7 @@ uninstall: uninstall-extra
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${LIB}; do \ for i in ${SHARED_LIB}; do \
if test -f ${DESTDIR}${libdir}/$$i; then \ if test -f ${DESTDIR}${libdir}/$$i; then \
if : ${UNINSTALL_LIB}; then \ if : ${UNINSTALL_LIB}; then \
${DELETE_OK}; \ ${DELETE_OK}; \
@ -605,7 +605,7 @@ clean:
${DIR_LEAVE}; \ ${DIR_LEAVE}; \
done done
for i in ${DEPS} ${OBJS} ${LIB_OBJS} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${LIB} ${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} ${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 \
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}; \