lspci: Indent PCIe Capability DevCap2 & DevCtl2 correctly

[pciutils.git] / Makefile

diff --git a/Makefile b/Makefile
index 0a21ee80cd83414617f83b8a183f04774cfd05cf..db7ff755c75a4c912fa13befaea0d43979186ebb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 # Makefile for The PCI Utilities
-# (c) 1998--2013 Martin Mares <mj@ucw.cz>
+# (c) 1998--2017 Martin Mares <mj@ucw.cz>
 
 OPT=-O2
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes
 
-VERSION=3.2.1
-DATE=2013-11-10
+VERSION=3.5.4
+DATE=2017-02-25
 
 # Host OS and release (override if you are cross-compiling)
 HOST=
@@ -24,6 +24,9 @@ SHARED=no
 # Use libkmod to resolve kernel modules on Linux (yes/no, default: detect)
 LIBKMOD=
 
+# Use libudev to resolve device names using hwdb on Linux (yes/no, default: detect)
+HWDB=
+
 # ABI version suffix in the name of the shared library
 # (as we use proper symbol versioning, this seldom needs changing)
 ABI_VERSION=.3
@@ -66,7 +69,7 @@ force:
 lib/config.h lib/config.mk:
        cd lib && ./configure
 
-lspci: lspci.o ls-vpd.o ls-caps.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB)
+lspci: lspci.o ls-vpd.o ls-caps.o ls-caps-vendor.o ls-ecaps.o ls-kernel.o ls-tree.o ls-map.o common.o lib/$(PCILIB)
 setpci: setpci.o common.o lib/$(PCILIB)
 
 LSPCIINC=lspci.h pciutils.h $(PCIINC)
@@ -114,7 +117,11 @@ install: all
        $(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
        $(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
 ifeq ($(SHARED),yes)
-       ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
+ifeq ($(LIBEXT),dylib)
+       ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME)$(ABI_VERSION).$(LIBEXT)
+else
+       ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(LIBEXT)$(ABI_VERSION)
+endif
 endif
 
 ifeq ($(SHARED),yes)
@@ -130,7 +137,11 @@ install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib
        $(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
        $(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
 ifeq ($(SHARED),yes)
-       ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
+ifeq ($(LIBEXT),dylib)
+       ln -sf $(LIBNAME)$(ABI_VERSION).$(LIBEXT) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(LIBEXT)
+else
+       ln -sf $(LIBNAME).$(LIBEXT)$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).$(LIBEXT)
+endif
 endif
 
 uninstall: all