[PATCH] Don't link pcmcia-check-broken-cis against libsysfs

Colin Watson cjwatson at debian.org
Sun Mar 28 20:59:59 EDT 2010


It uses the SYSFS_PATH_MAX macro from <sysfs/libsysfs.h>, but nothing
that requires run-time linkage.

Signed-off-by: Colin Watson <cjwatson at debian.org>
---
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 26f3e4b..a265873 100644
--- a/Makefile
+++ b/Makefile
@@ -150,10 +150,12 @@ CFLAGS +=	-I$(PWD)/src
 CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
 
 LIB_OBJS = -lc -lsysfs
+LIB_PLAIN_OBJS = -lc
 LIB_PCI_OBJS = -lc -lpci
 
 ifeq ($(strip $(STATIC)),true)
 	LIB_OBJS = -lsysfs
+	LIB_PLAIN_OBJS =
 	LIB_PCI_OBJS = -lpci
 	LDFLAGS += -static
 else
@@ -230,7 +232,7 @@ $(PCCARDCTL): $(LIBC) src/$(PCCARDCTL).o src/$(PCCARDCTL).c $(OBJS) $(HEADERS)
 	$(QUIET) $(STRIPCMD) $@
 
 $(PCMCIA_CHECK_BROKEN_CIS): $(LIBC) src/$(PCMCIA_CHECK_BROKEN_CIS).o src/read-cis.o $(OBJS) $(HEADERS)
-	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/$(PCMCIA_CHECK_BROKEN_CIS).o src/read-cis.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+	$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/$(PCMCIA_CHECK_BROKEN_CIS).o src/read-cis.o $(LIB_PLAIN_OBJS) $(ARCH_LIB_OBJS)
 	$(QUIET) $(STRIPCMD) $@
 
 $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config.o $(OBJS) $(HEADERS)
-- 
1.7.0.2



More information about the linux-pcmcia mailing list