Moved -lz from LDFLAGS to LDLIBS.

diff --git a/ChangeLog b/ChangeLog
index 398f5089553da263ead9fd1b94cc89b5e1d66d89..cca39ca0578816e8e62b011c2ce641c853401540 100644 (file)
--- 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 a75b6cee89cbb63203d88abbd2f7c01744fdccb6..b50626c947b7b17e8ca6d555b66b31e7edd319ee 100644 (file)
--- 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 54892c044667aa67005ad9f313aa66907a53592c..f9370ae99c49b1617eef54ade403c75722cd1bec 100644 (file)
--- 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 7c25c4210647491a5c87693ea54f2a69f8bba349..bc87397c6b3bc8b61c127fc777a96b20ad189f45 100755 (executable)
--- 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