[patch] Patch to s/\<LDFLAGS/AUTOFS_LDFLAGS/ in assignments, and update the one use of LDFLAGS

autofs-5.0.3-honor-ldflags.patch (text/plain), 1.12 KB, created by Kevin Pyle on 2009-01-02 04:48:42 UTC

diff -ru a/Makefile.rules b/Makefile.rules
--- a/Makefile.rules	2009-01-01 21:54:02.000000000 -0600
+++ b/Makefile.rules	2009-01-01 22:17:41.000000000 -0600
@@ -24,16 +24,16 @@
 
 ifdef DEBUG
 CFLAGS    ?= -g -Wall -DDEBUG
-LDFLAGS   = -g
+AUTOFS_LDFLAGS   = -g
 STRIP     = :
 else
 ifdef DONTSTRIP
 CFLAGS    ?= -O2 -g
-LDFLAGS   = -g
+AUTOFS_LDFLAGS   = -g
 STRIP     = :
 else
 CFLAGS    ?= -O2 -Wall
-LDFLAGS   = -s
+AUTOFS_LDFLAGS   = -s
 STRIP     = strip --strip-debug
 endif
 endif
@@ -45,10 +45,9 @@
 SOLDFLAGS = -shared
 
 CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
-LDFLAGS += -lpthread
 
 ifdef DMALLOCLIB
-LDFLAGS += $(DMALLOCLIB)
+AUTOFS_LDFLAGS += $(DMALLOCLIB)
 endif
 
 # Standard rules
diff -ru a/daemon/Makefile b/daemon/Makefile
--- a/daemon/Makefile	2009-01-01 22:14:10.000000000 -0600
+++ b/daemon/Makefile	2009-01-01 22:24:03.000000000 -0600
@@ -25,7 +25,7 @@
 all: automount
 
 automount: $(OBJS) $(AUTOFS_LIB)
-	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
+	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
 	$(STRIP) automount
 
 clean: