X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=fd4110998859d9ad0184c688a6fa7e67fa5e558f;hb=087e22e7bfdfc3eb0664ac9cca571c3858d838c9;hp=65436dbd3eb9e6f3338657ce747adc6ca8e627c4;hpb=4afd29d32fa8ddb279b0f73e1dfd313375ed9daa;p=pciutils.git

diff --git a/Makefile b/Makefile
index 65436db..fd41109 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
-# Makefile for Linux PCI Utilities
-# (c) 1998--2003 Martin Mares <mj@ucw.cz>
+# Makefile for The PCI Utilities
+# (c) 1998--2004 Martin Mares <mj@ucw.cz>
 
 OPT=-O2 -fomit-frame-pointer
 CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Wmissing-prototypes -Winline
 
-VERSION=2.1.12
-SUFFIX=-pre1
-DATE=2003-12-26
+VERSION=2.1.99-test7
+DATE=2004-07-05
 
 PREFIX=/usr/local
 SBINDIR=$(PREFIX)/sbin
@@ -15,7 +14,7 @@ MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ;
 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
@@ -28,15 +27,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 $(SHAREDIR) $(VERSION) $(HOST) $(RELEASE)
 
 lspci: lspci.o common.o $(PCILIB)
 setpci: setpci.o common.o $(PCILIB)
@@ -49,11 +53,14 @@ update-pciids: update-pciids.sh
 	sed <$< >$@ "s@^DEST=.*@DEST=$(SHAREDIR)/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)$(SUFFIX)/;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#@SHAREDIR@#$(SHAREDIR)#"
 
 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
@@ -71,29 +78,4 @@ uninstall: all
 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:[ 	]*\\)[0-9.]*/\\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:[ 	]*\\)[0-9.]*/\\1$(VERSION)/" <pciutils.spec >pciutils.spec.new
-	sed "s/\\(, version \\).*\./\\1$(VERSION)$(SUFFIX)./" <README >README.new
-	mv pciutils.lsm.new pciutils.lsm
-	mv pciutils.spec.new pciutils.spec
-	mv README.new README
-
-REL=pciutils-$(VERSION)$(SUFFIX)
-DISTTMP=/tmp/pciutils-dist
-
-dist: clean pci.ids
-	rm -rf $(DISTTMP)
-	mkdir $(DISTTMP)
-	cp -a . $(DISTTMP)/$(REL)
-	rm -rf `find $(DISTTMP)/$(REL) -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