X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=trunk%2Fe_dbus%2Fdebian%2Frules;fp=trunk%2Fe_dbus%2Fdebian%2Frules;h=2fcc2099990c128dae5ac108450e2ce97e5c24e6;hb=379ae98269afceed52f51a942daa398151bcdbfb;hp=ae7bf76d1d037104b3f99a2431c394ac3418c7ab;hpb=7471eeb5ae5af220f8454bb623064d098025c578;p=maemo-efl

diff --git a/trunk/e_dbus/debian/rules b/trunk/e_dbus/debian/rules
index ae7bf76..2fcc209 100755
--- a/trunk/e_dbus/debian/rules
+++ b/trunk/e_dbus/debian/rules
@@ -4,19 +4,46 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS :=  --disable-build-test-gui
+DEB_CONFIGURE_EXTRA_FLAGS:=--disable-build-test-gui
+CFLAGS+=-lpthread
 
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS += -lpthread
-
-ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-	CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
-	ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))
-		CFLAGS += -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s
-	endif
-	ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS)))
-		CFLAGS += -mcpu=arm926ej-s
+ifeq ($(DEB_BUILD_ARCH),armel)
+	COMMON_CFLAGS=-DNDEBUG=1 -fomit-frame-pointer -O2 -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+	N770_CFLAGS=-mcpu=arm926ej-s
+	N8x0_CFLAGS=-mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s
+	ifneq ($(DEB_BUILD_OPTIONS),)
+		ifneq (,$(findstring n8x0,$(DEB_BUILD_OPTIONS)))
+			SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
+		else
+			ifneq (,$(findstring n770,$(DEB_BUILD_OPTIONS)))
+				SPECIFIC_CFLAGS=$(N770_CFLAGS)
+			endif
+		endif
 	endif
+    ifeq ($(SPECIFIC_CFLAGS),)
+        ifeq (0,$(shell test -e /etc/osso_software_version; echo $$?))
+            SW_VERSION?=$(shell cat /etc/osso_software_version|cut -d_ -f2)
+			ifneq (,$(findstring $(SW_VERSION),OSSO1.1 2008SE DIABLO))
+				SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
+            endif
+		endif
+    	ifeq ($(SPECIFIC_CFLAGS),)
+            # Our last hope is to look at the value returned by `sb-conf current`
+            SB_CURRENT?=$(shell sb-conf current|cut -d_ -f1)
+			ifneq (,$(findstring $(SB_CURRENT),GREGALE BORA CHINOOK DIABLO))
+				ifeq ($(SB_CURRENT),GREGALE)
+					SPECIFIC_CFLAGS=$(N770_CFLAGS)
+				else
+					SPECIFIC_CFLAGS=$(N8x0_CFLAGS)
+				endif
+			else
+				COMMON_CFLAGS=
+			endif
+        endif
+    endif
 endif
 
+CFLAGS+=$(COMMON_CFLAGS) $(SPECIFIC_CFLAGS)
+