From: Martin Mares <mj@ucw.cz>
Date: Fri, 19 Oct 2007 13:43:02 +0000 (+0200)
Subject: Moved -lz from LDFLAGS to LDLIBS.
X-Git-Tag: v3.0.0~8^2~6
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=6cdb9d937061ed3998df427f7b6cd1fd544a79f8;p=pciutils.git

Moved -lz from LDFLAGS to LDLIBS.
---

diff --git a/ChangeLog b/ChangeLog
index 398f508..cca39ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-19  Martin Mares <mj@ucw.cz>
+
+	* Makefile, lib/Makefile: Moved -lz from LDFLAGS to LDLIBS.
+	Also added an explicit pattern rule for linking to make sure
+	that LDLIBS is used on all platforms. Thanks to Dan Nicholson
+	for the suggestion.
+
 2007-10-19  Martin Mares <mj@ucw.cz>
 
 	* Released as 2.2.8.
diff --git a/Makefile b/Makefile
index a75b6ce..b50626c 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,9 @@ update-pciids: update-pciids.sh
 	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/$(PCI_IDS)@;s@^PCI_COMPRESSED_IDS=.*@PCI_COMPRESSED_IDS=$(PCI_COMPRESSED_IDS)@"
 	chmod +x $@
 
+%: %.o
+	$(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@
+
 %.8: %.man
 	M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#"
 
diff --git a/TODO b/TODO
index 54892c0..f9370ae 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+- review class names
+
 Capabilities with partial decoding:
 - PCIe 2nd set of control/status registers (have spec)
 - HyperTransport caps (have spec)
diff --git a/lib/configure b/lib/configure
index 7c25c42..bc87397 100755
--- a/lib/configure
+++ b/lib/configure
@@ -92,7 +92,7 @@ case $sys in
 		echo >>$c '#define PCI_HAVE_PM_NBSD_LIBPCI'
 		echo >>$c '#define PCI_PATH_NBSD_DEVICE "/dev/pci0"'
 		echo >>$m 'PCILIB=lib/libpciutils.a'
-		echo >>$m 'LDFLAGS+=-lpci'
+		echo >>$m 'LDLIBS+=-lpci'
 		;;
     	gnu)
 		echo_n " i386-ports"
@@ -122,7 +122,7 @@ if [ "$zlib" = yes ] ; then
 	echo >>$c '#define PCI_COMPRESSED_IDS'
 	echo >>$c '#define PCI_IDS "pci.ids.gz"'
 	echo >>$m 'LIBZ=-lz'
-	echo >>$m 'LDFLAGS+=$(LIBZ)'
+	echo >>$m 'LDLIBS+=$(LIBZ)'
 else
 	echo >>$c '#define PCI_IDS "pci.ids"'
 fi