From: Lan Yixun (dlan) <dennis.yxun@xxxxxxxxx> quote: "Don't use this variable to pass library names (-l) to the linker; use LIBS instead." see the section "Variable: LDFLAGS" in: http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/PreseOutput-Variables.html#Preset-Output-Variables Edited by: Ian Kent <raven@xxxxxxxxxx> The variable usage changes for LDFLAGS and LIBS appear to be dependent on each other so merge them to try and avoid breakage if not all are used by someone. I also had changed the patch titles slightly when I imported them but they should be easily recognisable. - merge patches - pthread-link-library-should-be-put-into-LIBS-not-LDFLAGS - library-should-be-passed-via-variable-LIBS-not-LDFLAGS - accumulate-LIBS-variable-changes-otherwise-we-may-lose-early-settings - allow-user-to-pass-LDFLAGS-via-configure - add LIBS to build rules, might fix DMALLOC build problem Signed-off-by: Lan Yixun (dlan) <dennis.yxun@xxxxxxxxx> --- CHANGELOG | 1 + Makefile.rules | 10 ++++++---- daemon/Makefile | 2 +- modules/Makefile | 12 ++++++------ 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ec9d7f0..3af7ece 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -65,6 +65,7 @@ - add missing libtirpc lib to mount_nfs.so when TIRPC enabled. - use compiler determined by configure instead of hard-coded ones. - remove hard-coded STRIP variable. +- use LIBS for link libraries. 25/07/2012 autofs-5.0.7 ======================= diff --git a/Makefile.rules b/Makefile.rules index d00ba3c..fa53459 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -45,17 +45,19 @@ LD ?= ld SOLDFLAGS = -shared CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64 -LDFLAGS += -lpthread +LIBS += -lpthread ifdef TIRPCLIB CFLAGS += -I/usr/include/tirpc -LDFLAGS += $(TIRPCLIB) +LIBS += $(TIRPCLIB) endif ifdef DMALLOCLIB -LDFLAGS += $(DMALLOCLIB) +LIBS += $(DMALLOCLIB) endif +LIBS += $(LIBNSL) + # Standard rules .SUFFIXES: .c .o .s .so @@ -67,5 +69,5 @@ endif $(CC) $(CFLAGS) -S $< .c.so: - $(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL) + $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(LIBS) $(STRIP) $*.so diff --git a/daemon/Makefile b/daemon/Makefile index 9e9d635..6604c9a 100644 --- a/daemon/Makefile +++ b/daemon/Makefile @@ -20,7 +20,7 @@ CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\" CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\" CFLAGS += -DVERSION_STRING=\"$(version)\" LDFLAGS += -rdynamic -LIBS = -ldl +LIBS += -ldl ifeq ($(LDAP), 1) CFLAGS += $(XML_FLAGS) diff --git a/modules/Makefile b/modules/Makefile index e61e338..de01ebd 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -98,8 +98,8 @@ endif # Ad hoc compilation rules for modules which need auxilliary libraries # lookup_hesiod.so: lookup_hesiod.c - $(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ - lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV) + $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \ + lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV) $(LIBS) $(STRIP) lookup_hesiod.so cyrus-sasl.o: cyrus-sasl.c @@ -109,13 +109,13 @@ cyrus-sasl-extern.o: cyrus-sasl-extern.c $(CC) $(CFLAGS) $(LDAP_FLAGS) -c $< lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ) - $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ + $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ lookup_ldap.c dclist.o base64.o $(SASL_OBJ) \ - $(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) + $(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) $(LIBS) $(STRIP) lookup_ldap.so mount_nfs.so: mount_nfs.c replicated.o - $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ - mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) $(TIRPCLIB) + $(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ + mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBS) $(STRIP) mount_nfs.so -- To unsubscribe from this list: send the line "unsubscribe autofs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
