From: Martin Mares <mj@ucw.cz>
Date: Sat, 9 Sep 2006 11:08:12 +0000 (+0200)
Subject: Moved all system-dependent decisions from Makefile to lib/configure.
X-Git-Tag: v3.0.0~27
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=840d09ae0da82976c799e56fb82702cfa2870382;p=pciutils.git

Moved all system-dependent decisions from Makefile to lib/configure.
---

diff --git a/ChangeLog b/ChangeLog
index 71107e1..b18fd90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-09  Martin Mares  <mj@ucw.cz>
 
+	* Makefile: Moved all system-dependent decisions to lib/configure,
+	since config.mk is included in the top-level Makefile anyway.
+
 	* lib/configure: When configuring for Linux, ignore the kernel version
 	and always build all access methods.
 
diff --git a/Makefile b/Makefile
index 5aaf06b..b187e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,20 +18,6 @@ PCILIB=lib/libpci.a
 PCIINC=lib/config.h lib/header.h lib/pci.h lib/types.h lib/sysdep.h
 
 -include lib/config.mk
-ifdef PCI_COMPRESSED_IDS
-LDFLAGS += -lz
-endif
-
-ifeq ($(shell uname),NetBSD)
-PCILIB=lib/libpciutils.a
-LDFLAGS+=-lpci
-else
-ifeq ($(shell uname),AIX)
-CFLAGS=-g
-INSTALL=installbsd
-DIRINSTALL=mkdir -p
-endif
-endif
 
 HOST=
 RELEASE=
diff --git a/TODO b/TODO
index 6b45307..0768888 100644
--- a/TODO
+++ b/TODO
@@ -8,6 +8,3 @@
 PCIIDS:
 - another mirror at Atrey?
 - delete old DB at SF
-
-- -Winline
-- release testing is bogus
diff --git a/lib/configure b/lib/configure
index 2fc33bb..57c5509 100755
--- a/lib/configure
+++ b/lib/configure
@@ -35,8 +35,10 @@ echo " $host $rel"
 zlib=$5
 
 c=config.h
+m=config.mk
 echo >$c "#define PCI_ARCH_`echo $cpu | tr 'a-z' 'A-Z'`"
 echo >>$c "#define PCI_OS_`echo $sys | tr 'a-z' 'A-Z'`"
+rm -f $m
 
 echo_n "Looking for access methods..."
 
@@ -79,11 +81,16 @@ case $sys in
 	aix)
 		echo_n " aix-device"
 		echo >>$c '#define PCI_HAVE_PM_AIX_DEVICE'
+		echo >>$m 'CFLAGS=-g'
+		echo >>$m 'INSTALL=installbsd'
+		echo >>$m 'DIRINSTALL=mkdir -p'
 		;;
 	netbsd)
 		echo_n " nbsd-libpci"
 		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'
 		;;
     	gnu)
 		echo_n " i386-ports"
@@ -111,11 +118,12 @@ else
 fi
 if [ "$zlib" = yes ] ; then
 	echo >>$c '#define PCI_COMPRESSED_IDS'
-	echo >>$c "#define PCI_IDS \"pci.ids.gz\""
+	echo >>$c '#define PCI_IDS "pci.ids.gz"'
+	echo >>$m 'LDFLAGS+=-lz'
 else
-	echo >>$c "#define PCI_IDS \"pci.ids\""
+	echo >>$c '#define PCI_IDS "pci.ids"'
 fi
 echo >>$c "#define PCI_PATH_IDS_DIR \"$idsdir\""
 
 echo >>$c "#define PCILIB_VERSION \"$version\""
-sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >config.mk
+sed '/"/{s/^#define \([^ ]*\) "\(.*\)"$/\1=\2/;p;d;};s/^#define \(.*\)/\1=1/' <$c >>$m