X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=4b69e877d4e43e658c8225e28924b9270a69467f;hb=1d5cf727a564396ba51127140457ad9b6cedac7d;hp=dd1973c6e1da443ed87b409e145230b6efd68d56;hpb=ded39e3a43bcf306ec7f4341dfab55262cf84a71;p=pciutils.git

diff --git a/Makefile b/Makefile
index dd1973c..4b69e87 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,24 @@
-# Makefile for Linux PCI Utilities
-# (c) 1998--2003 Martin Mares <mj@ucw.cz>
+# Makefile for The PCI Utilities
+# (c) 1998--2006 Martin Mares <mj@ucw.cz>
 
-OPT=-O2 -fomit-frame-pointer
+OPT=-O2
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
 
-VERSION=2.1.99-test1
-DATE=2003-12-27
+VERSION=2.2.2
+DATE=2006-05-05
 
 PREFIX=/usr/local
 SBINDIR=$(PREFIX)/sbin
 SHAREDIR=$(PREFIX)/share
+IDSDIR=$(SHAREDIR)
 MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
 INSTALL=install
 DIRINSTALL=install -d
 PCILIB=lib/libpci.a
-PCIINC=lib/config.h lib/header.h lib/pci.h
+PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
 
 ifeq ($(shell uname),NetBSD)
-PCILIB=libpciutils.a
+PCILIB=lib/libpciutils.a
 LDFLAGS+=-lpci
 else
 ifeq ($(shell uname),AIX)
@@ -27,15 +28,20 @@ DIRINSTALL=mkdir -p
 endif
 endif
 
+HOST=
+RELEASE=
+
 export
 
 all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 pci.ids
 
-$(PCILIB): $(PCIINC)
+$(PCILIB): $(PCIINC) force
 	$(MAKE) -C lib all
 
+force:
+
 lib/config.h:
-	cd lib && ./configure $(SHAREDIR) $(VERSION)
+	cd lib && ./configure $(IDSDIR) $(VERSION) $(HOST) $(RELEASE)
 
 lspci: lspci.o common.o $(PCILIB)
 setpci: setpci.o common.o $(PCILIB)
@@ -45,54 +51,32 @@ setpci.o: setpci.c pciutils.h $(PCIINC)
 common.o: common.c pciutils.h $(PCIINC)
 
 update-pciids: update-pciids.sh
-	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/pci.ids@"
+	sed <$< >$@ "s@^DEST=.*@DEST=$(IDSDIR)/pci.ids@"
 
 %.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#@SHAREDIR@#$(SHAREDIR)#"
+	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)#"
 
 clean:
 	rm -f `find . -name "*~" -o -name "*.[oa]" -o -name "\#*\#" -o -name TAGS -o -name core`
 	rm -f update-pciids lspci setpci lib/config.* *.8 pci.ids.*
+	rm -rf maint/dist
+
+distclean: clean
 
 install: all
 # -c is ignored on Linux, but required on FreeBSD
-	$(DIRINSTALL) -m 755 $(SBINDIR) $(SHAREDIR) $(MANDIR)/man8
+	$(DIRINSTALL) -m 755 $(SBINDIR) $(IDSDIR) $(MANDIR)/man8
 	$(INSTALL) -c -m 755 -s lspci setpci $(SBINDIR)
 	$(INSTALL) -c -m 755 update-pciids $(SBINDIR)
-	$(INSTALL) -c -m 644 pci.ids $(SHAREDIR)
+	$(INSTALL) -c -m 644 pci.ids $(IDSDIR)
 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(MANDIR)/man8
 
 uninstall: all
 	rm -f $(SBINDIR)/lspci $(SBINDIR)/setpci $(SBINDIR)/update-pciids
-	rm -f $(SHAREDIR)/pci.ids
+	rm -f $(IDSDIR)/pci.ids
 	rm -f $(MANDIR)/man8/lspci.8 $(MANDIR)/man8/setpci.8 $(MANDIR)/man8/update-pciids.8
 
 get-ids:
 	cp ~/tree/pciids/pci.ids pci.ids
 
-pci.ids:
-	@ [ -f pci.ids ] || echo >&2 "The pci.ids file is no longer part of the CVS. Please do run update-ids.sh to download them." && false
-
-release:
-	sed "s/^\\(Version:[ 	]*\\).*/\\1$(VERSION)/;s/^\\(Entered-date:[ 	]*\\)[0-9]*/\\1`date -d$(DATE) '+%y%m%d'`/;s/\\(pciutils-\\)[0-9.]*/\\1$(VERSION)\\./" <pciutils.lsm >pciutils.lsm.new
-	sed "s/^\\(Version:[ 	]*\\).*/\\1$(VERSION)/" <pciutils.spec >pciutils.spec.new
-	sed "s/\\(, version \\).*\./\\1$(VERSION)./" <README >README.new
-	mv pciutils.lsm.new pciutils.lsm
-	mv pciutils.spec.new pciutils.spec
-	mv README.new README
-
-REL=pciutils-$(VERSION)
-DISTTMP=/tmp/pciutils-dist
-
-dist: clean pci.ids
-	rm -rf $(DISTTMP)
-	mkdir $(DISTTMP)
-	cp -a . $(DISTTMP)/$(REL)
-	rm -rf `find $(DISTTMP)/$(REL) -name .arch-ids -o -name "{arch}" -o -name CVS -o -name tmp -o -name maint`
-	cd $(DISTTMP) ; tar czvvf /tmp/$(REL).tar.gz $(REL)
-	rm -rf $(DISTTMP)
-
-upload: dist
-	maint/upload $(REL)
-
-.PHONY: all lib clean install uninstall dist man release upload get-ids
+.PHONY: all clean distclean install uninstall get-ids force