X-Git-Url: http://git.maemo.org/git/?p=browser-switch;a=blobdiff_plain;f=debian%2Frules;h=33738dd2439cb9c394ee32eb5852ab3eaf1ae5df;hp=82a69bf099861b8ee779d8ae355df0b563b28f47;hb=4ff578a00cae1d0be96e337b2971df6821331435;hpb=10bb9f19ad2ce6a5d3de98479de2a909481b1d84

diff --git a/debian/rules b/debian/rules
index 82a69bf..33738dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,16 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+ifeq ($(DEB_HOST_ARCH),armel)
+	#EXTRA_CFLAGS += -mcpu=arm1136jf-s
+	# Use Thumb for smaller binaries if requested
+	ifneq (,$(filter thumb,$(DEB_BUILD_OPTIONS)))
+		EXTRA_CFLAGS += -mthumb
+	endif
+endif
 
-
+EXTRA_CPPFLAGS = -DFREMANTLE `pkg-config --cflags dbus-1`
+EXTRA_LDFLAGS = `pkg-config --libs dbus-1`
 
 configure: configure-stamp
 configure-stamp:
@@ -22,6 +30,9 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 
+	make EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CPPFLAGS="$(EXTRA_CPPFLAGS)" EXTRA_LDFLAGS="$(EXTRA_LDFLAGS)"
+	make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)" EXTRA_CPPFLAGS="$(EXTRA_CPPFLAGS)"
+
 	touch $@
 
 clean:
@@ -29,6 +40,9 @@ clean:
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
+	make clean
+	make -C config-ui clean
+
 	dh_clean 
 
 install: build
@@ -37,13 +51,17 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/browser-proxy.
-	install -c -m 0755 browser-proxy debian/browser-proxy/usr/bin/browser-proxy
-	install -c -m 0644 com.nokia.osso_browser.service debian/browser-proxy/usr/share/dbus-1/services
-	install -c -m 0755 browser debian/browser-proxy/usr/bin/browser
+	# Add here commands to install the package into
+	# debian/browser-switchboard.
+	make DESTDIR=debian/browser-switchboard install
+	make -C config-ui DESTDIR=../debian/browser-switchboard install
+	install -c -m 0644 debian/browser-switchboard-cp.desktop debian/browser-switchboard/usr/share/applications/hildon-control-panel
 
 
 binary-indep: build install
+# arch: any package, nothing to do here
+
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
@@ -62,19 +80,16 @@ binary-indep: build install
 #	dh_installinfo
 #	dh_installman
 #	dh_link
-#	dh_strip
+	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_perl
 #	dh_makeshlibs
 	dh_installdeb
-#	dh_shlibdeps
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: build install
-# arch: all package, nothing to do here
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure