[pkg-wpa-devel] r1680 - in /wpa/trunk/debian: ./ config/ config/hostapd/ config/wpasupplicant/

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Sat Apr  7 23:31:15 2012
New Revision: 1680

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1680
Log:
roughly merge build processes

Added:
    wpa/trunk/debian/config/hostapd/
    wpa/trunk/debian/config/wpasupplicant/
    wpa/trunk/debian/config/wpasupplicant/kfreebsd
      - copied unchanged from r1676, wpa/trunk/debian/config/kfreebsd
    wpa/trunk/debian/config/wpasupplicant/kfreebsd-udeb
      - copied unchanged from r1676, wpa/trunk/debian/config/kfreebsd-udeb
    wpa/trunk/debian/config/wpasupplicant/linux
      - copied unchanged from r1676, wpa/trunk/debian/config/linux
    wpa/trunk/debian/config/wpasupplicant/linux-udeb
      - copied unchanged from r1676, wpa/trunk/debian/config/linux-udeb
Removed:
    wpa/trunk/debian/config/kfreebsd
    wpa/trunk/debian/config/kfreebsd-udeb
    wpa/trunk/debian/config/linux
    wpa/trunk/debian/config/linux-udeb
Modified:
    wpa/trunk/debian/rules

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1680&op=diff
==============================================================================
--- wpa/trunk/debian/rules (original)
+++ wpa/trunk/debian/rules Sat Apr  7 23:31:15 2012
@@ -1,24 +1,25 @@
 #!/usr/bin/make -f
 
-CFLAGS = -MMD -Wall -g
-UCFLAGS = -MMD -Wall -g -Os
+CFLAGS   = -MMD -Wall -g
+UCFLAGS  = -MMD -Wall -g -Os
 CXXFLAGS = -g
-LDFLAGS = -Wl,--as-needed
+LDFLAGS  = -Wl,--as-needed
 V = 1
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	CFLAGS   += -O0
 	CXXFLAGS += -O0
 else
-	CFLAGS += -O2
+	CFLAGS   += -O2
 	CXXFLAGS += -O2
 endif
 
 export CFLAGS CXXFLAGS LDFLAGS V
 
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-BUILD_DOT_CONFIG := debian/config/$(DEB_HOST_ARCH_OS)
-UDEB_DOT_CONFIG := debian/config/$(DEB_HOST_ARCH_OS)-udeb
+DEB_HOST_ARCH_OS              ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+HOSTAPD_DOT_CONFIG            := debian/config/wpasupplicant/$(DEB_HOST_ARCH_OS)
+WPASUPPLICANT_DOT_CONFIG      := debian/config/wpasupplicant/$(DEB_HOST_ARCH_OS)
+WPASUPPLICANT_UDEB_DOT_CONFIG := debian/config/wpasupplicant/$(DEB_HOST_ARCH_OS)-udeb
 
 ### start dh overrides
 override_dh_auto_configure:
@@ -26,20 +27,25 @@
 	                  --buildsystem=qmake
 
 override_dh_auto_build:
-	# Build udeb
-	cp -v --remove-destination $(UDEB_DOT_CONFIG) wpa_supplicant/.config
+	# build wpasupplicant-udeb
+	cp -v --remove-destination $(WPASUPPLICANT_UDEB_DOT_CONFIG) wpa_supplicant/.config
 	CFLAGS="$(UCFLAGS)" dh_auto_build --sourcedirectory=wpa_supplicant \
 	              --buildsystem=makefile \
 		      --parallel
 	mv -v wpa_supplicant/wpa_supplicant wpa_supplicant/wpa_supplicant-udeb
 	dh_auto_clean --sourcedirectory=wpa_supplicant \
 	              --buildsystem=makefile
-	# End udeb
-	cp -v --remove-destination $(BUILD_DOT_CONFIG) wpa_supplicant/.config
+	# build wpasupplicant
+	cp -v --remove-destination $(WPASUPPLICANT_UDEB_DOT_CONFIG) wpa_supplicant/.config
 	dh_auto_build --sourcedirectory=wpa_supplicant \
 	              --buildsystem=makefile \
 		      --parallel
 	dh_auto_build --sourcedirectory=wpa_supplicant/wpa_gui-qt4 \
+	              --buildsystem=qmake \
+		      --parallel
+	# build hostapd
+	cp --remove-destination $(HOSTAPD_DOT_CONFIG) hostapd/.config
+	dh_auto_build --sourcedirectory=hostapd \
 	              --buildsystem=qmake \
 		      --parallel
 
@@ -50,15 +56,19 @@
 	              --buildsystem=qmake
 	find wpa_supplicant/wpa_gui-qt4 -type d \
 		-name \.moc -o -name \.ui -o -name \.obj | xargs rm -rf
+	dh_auto_clean --sourcedirectory=hostapd \
+	              --buildsystem=makefile
 
 override_dh_auto_install:
 	$(info Skip dh_auto_install ...)
 
 override_dh_clean:
+	dh_clean hostapd/.config
 	dh_clean wpa_supplicant/.config
 
 override_dh_fixperms:
 	dh_fixperms
+	chmod 0755 debian/hostapd/etc/hostapd/ifupdown.sh
 	chmod 0755 debian/wpasupplicant/etc/wpa_supplicant/*.sh
 	chmod 0755 debian/wpagui/usr/share/wpagui/netdev_wrapper
 
@@ -77,6 +87,7 @@
 		debian/wpasupplicant-udeb/sbin/wpa_supplicant
 
 override_dh_installchangelogs:
+	#dh_installchangelogs hostapd/ChangeLog
 	dh_installchangelogs wpa_supplicant/ChangeLog
 ### end dh overrides