[Devil-linux-commit] build Makefile.build, 1.79, 1.80 Makefile.prepare, 1.9, 1.10

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20420

Modified Files:
	Makefile.build Makefile.prepare 
Log Message:
fixed more dependencies


Index: Makefile.build
===================================================================
RCS file: /cvsroot/devil-linux/build/Makefile.build,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- Makefile.build	10 Feb 2015 00:38:32 -0000	1.79
+++ Makefile.build	12 Feb 2015 02:19:09 -0000	1.80
@@ -26,7 +26,7 @@
 	 libcap libcap-ng libdbi libdvdcss libevent libgpg-error \
 	 libiconv libmad libnfnetlink libnfsidmap libnl \
 	 libol libosip2 libpcap libtirpc giflib \
-	 libusb lzo mhash ncurses \
+	 lzo mhash ncurses \
 	 pax-utils paxctl pcre popt readline \
 	 tcp_wrappers which libdaemon \
 	 gzip xz keyutils libmnl cmake
@@ -38,9 +38,10 @@
 GROUP_15 := gd glib gnutls imap krb5 \
 	 libnetfilter_conntrack libxslt mcrypt mysql h323plus \
 	 neon tz Pound libconfig libnetfilter_cttimeout \
-	 libnetfilter_cthelper libnetfilter_queue usbutils libusb-compat
+	 libnetfilter_cthelper libnetfilter_queue
 
-GROUP_16 := util-linux gawk groff coreutils grep gperf file
+GROUP_16 := util-linux gawk groff coreutils grep gperf file \
+	  usbutils udev libusb libusb-compat pciutils 
 	 
 GROUP_17 := e2fsprogs gdchart openldap pam_mysql postgresql \
 	 wvstreams iperf irqbalance ffmpeg pam_mount
@@ -72,7 +73,7 @@
 	 ncftp net-tools netacct-mysql netpbm nfs-utils \
 	 nmap noip_updater ntp oidentd \
 	 gnugk openssh openvpn otpd p7zip \
-	 parted patch-o-matic pciutils pcwd \
+	 parted patch-o-matic pcwd \
 	 perl pohmelfs postfix pptp-patches \
 	 procinfo procmail procps psmisc qadsl \
 	 quota-tools radvd rcs reiserfsprogs rng-tools \
@@ -96,7 +97,7 @@
 	 hostapd httpd kid libdbi-drivers man \
 	 mrtg pam_otp_auth ppp python-ldap radiusplugin \
 	 razor-agents rpm rrdtool sarg scponly \
-	 strongswan swig syslog-ng udev webmin fail2ban nginx pyzor tornado
+	 strongswan swig syslog-ng webmin fail2ban nginx pyzor tornado
 
 GROUP_21 := Mail-SpamAssassin bluez-firmware bluez-hcidump bluez-utils ippool \
 	 lm_sensors mdadm mod_auth_kerb mod_authn_otp mod_perl mod_proxy_html mod_fcgid module-init-tools \
@@ -204,7 +205,7 @@
 
 giflib:  | $(GROUP_12)
 
-libusb:  | $(GROUP_12)
+libusb:  | $(GROUP_15) udev
 
 lzo:  | $(GROUP_12) zlib
 
@@ -562,7 +563,7 @@
 
 patch-o-matic:  | $(GROUP_18)
 
-pciutils:  | $(GROUP_18)
+pciutils:  | $(GROUP_15)
 
 pcwd:  | $(GROUP_18)
 
@@ -668,7 +669,7 @@
 
 usbat-02:  | $(GROUP_18)
 
-usbutils:  | $(GROUP_14) libusb
+usbutils:  | $(GROUP_15)
 
 vim:  | $(GROUP_18)
 
@@ -780,7 +781,7 @@
 
 syslog-ng:  | $(GROUP_19)
 
-udev:  | $(GROUP_19) kmod
+udev:  | $(GROUP_14) kmod util-linux usbutils pciutils
 
 webmin:  | $(GROUP_19)
 
@@ -980,4 +981,4 @@
 
 GateOne: | tornado
 
-libusb-compat: | $(GROUP_14) usbutils
+libusb-compat: | $(GROUP_15) usbutils

Index: Makefile.prepare
===================================================================
RCS file: /cvsroot/devil-linux/build/Makefile.prepare,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.prepare	8 Feb 2015 21:41:43 -0000	1.9
+++ Makefile.prepare	12 Feb 2015 02:19:09 -0000	1.10
@@ -17,7 +17,7 @@
 GROUP_09 := libtool
 GROUP_10 := m4 autoconf bison makedepend nasm
 GROUP_11 := automake dev86
-GROUP_X := flex Python pkgconfig
+GROUP_X := flex Python pkgconfig libusb
 # End of dependencies
 
 .PHONY: all
@@ -68,3 +68,4 @@
 
 pkgconfig: | $(GROUP_11)
 
+libusb: pkgconfig