X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=33738dd2439cb9c394ee32eb5852ab3eaf1ae5df;hb=ae25c6b332df1c92b1433474bbf4c8b8b857b7ff;hp=014ed5eca6de6ed1fcd4fd968426689e056336df;hpb=e62e2b06b35a1bdfa3204f25b774d7ee33b5d6dc;p=browser-switch

diff --git a/debian/rules b/debian/rules
index 014ed5e..33738dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Optimize for N8x0 CPUs if building for armel
 ifeq ($(DEB_HOST_ARCH),armel)
-	EXTRA_CFLAGS += -mcpu=arm1136jf-s
+	#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:
 	touch configure-stamp
@@ -28,8 +30,8 @@ build: build-stamp
 build-stamp: configure-stamp 
 	dh_testdir
 
-	make EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
-	make -C config-ui EXTRA_CFLAGS="$(EXTRA_CFLAGS)"
+	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 $@
 
@@ -53,6 +55,7 @@ install: build
 	# 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