X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=041fde68aec9cfe910638b840116f720acb24af3;hb=596cc4d213c59e0795e542e1017913904d137ca9;hp=045acae53f14def56a1b34e67e66e90cfe2bcfdd;hpb=14d6c0a377eff7ac4f488a640249a25703725cac;p=pciutils.git

diff --git a/Makefile b/Makefile
index 045acae..041fde6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,27 @@
-# $Id: Makefile,v 1.33 2000/04/21 11:58:00 mj Exp $
+# $Id: Makefile,v 1.43 2002/12/26 19:28:33 mj Exp $
 # Makefile for Linux PCI Utilities
-# (c) 1998--2000 Martin Mares <mj@suse.cz>
+# (c) 1998--2002 Martin Mares <mj@ucw.cz>
 
 OPT=-O2 -fomit-frame-pointer
 #OPT=-O2 -g
-CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes -Werror
+CFLAGS=$(OPT) -Wall -W -Wno-parentheses -Wstrict-prototypes
 
-VERSION=2.1.7
-SUFFIX=
-#SUFFIX=-alpha
-DATE=2000-04-21
+VERSION=2.1.11
+SUFFIX=-pre1
+DATE=2002-12-26
 
 INSTALL=install
 DIRINSTALL=install -d
+PCILIB=libpci.a
 ifeq ($(shell uname),FreeBSD)
 ROOT=/usr/local
 PREFIX=/usr/local
 else
+ifeq ($(shell uname),NetBSD)
+ROOT=$(PREFIX)
+PCILIB=libpciutils.a
+LDFLAGS+=-lpci
+else
 ifeq ($(shell uname),AIX)
 ROOT=/usr/local
 PREFIX=/usr/local
@@ -28,11 +33,13 @@ ROOT=/
 PREFIX=/usr
 endif
 endif
+endif
 MANDIR=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
+DISTTMP=/tmp/pciutils-dist
 
 export
 
-all: lib lspci setpci lspci.8 setpci.8
+all: lib lspci setpci lspci.8 setpci.8 pci.ids
 
 lib: lib/config.h
 	$(MAKE) -C lib all
@@ -56,19 +63,34 @@ clean:
 	rm -rf dist
 
 install: all
-	# -c is ignored on Linux, but required on FreeBSD
+# -c is ignored on Linux, but required on FreeBSD
 	$(DIRINSTALL) -m 755 $(ROOT)/sbin $(PREFIX)/share $(MANDIR)/man8
 	$(INSTALL) -c -m 755 -s lspci setpci $(ROOT)/sbin
-	$(INSTALL) -c -m 644 pci.ids $(PREFIX)/share
+	if [ ! -f $(PREFIX)/share/pci.ids -o pci.ids -nt $(PREFIX)/share/pci.ids ] ; then \
+		$(INSTALL) -c -m 644 pci.ids $(PREFIX)/share ; \
+	elif [ -f $(PREFIX)/share/pci.ids ] ; then \
+		echo "$(PREFIX)/share/pci.ids is same or newer than the version to be installed, skipping." ; \
+	fi
 	$(INSTALL) -c -m 644 lspci.8 setpci.8 $(MANDIR)/man8
-	# Remove relics from old versions
+# Remove relics from old versions
 	rm -f $(ROOT)/etc/pci.ids
 
 uninstall: all
 	rm -f $(ROOT)/sbin/lspci $(ROOT)/sbin/setpci
-	rm -f $(PREFIX)/pci.ids
+	rm -f $(PREFIX)/share/pci.ids
 	rm -f $(PREFIX)/man/man8/lspci.8 $(PREFIX)/man/man8/setpci.8
 
+update-ids:
+	if [ ! -f pci.ids.orig ] ; then mv pci.ids pci.ids.orig ; fi
+	wget http://pciids.sf.net/pci.ids.bz2
+	bzip2 -d pci.ids.bz2
+
+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 make update-ids 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
@@ -77,13 +99,18 @@ release:
 	mv pciutils.spec.new pciutils.spec
 	mv README.new README
 
-REL=pciutils-$(VERSION)
+REL=pciutils-$(VERSION)$(SUFFIX)
+
+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`
+	[ -f $(DISTTMP)/$(REL)/lib/header.h ] || cp /usr/src/linux/include/linux/pci.h dist/$(REL)/lib/header.h
+	cd $(DISTTMP) ; tar czvvf /tmp/$(REL).tar.gz $(REL)
+	rm -rf $(DISTTMP)
 
-dist: clean
-	mkdir dist
-	cp -a . dist/$(REL)
-	rm -rf `find dist/$(REL) -name CVS -o -name tmp` dist/$(REL)/dist
-	[ -f dist/$(REL)/lib/header.h ] || cp /usr/src/linux/include/linux/pci.h dist/$(REL)/lib/header.h
-	cd dist ; tar czvvf /tmp/$(REL).tar.gz $(REL)
+upload: dist
+	maint/upload $(REL)
 
-.PHONY: all lib clean install dist man release
+.PHONY: all lib clean install uninstall dist man release upload update-ids get-ids