Removed unused files

diff --git a/trunk/e_dbus/debian/rules b/trunk/e_dbus/debian/rules
index 91b884b..d72a0f9 100755 (executable)
--- a/trunk/e_dbus/debian/rules
+++ b/trunk/e_dbus/debian/rules
@@ -3,7 +3,9 @@
 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
+include /usr/share/cdbs/1/rules/maemo-cflags.mk
 
+DEB_CONFIGURE_SCRIPT := ./autogen.sh
 DEB_CONFIGURE_EXTRA_FLAGS:=            \
        --disable-build-test-gui        \
        --disable-ehal                          \
@@ -11,44 +13,3 @@ DEB_CONFIGURE_EXTRA_FLAGS:=          \
        --disable-enotify
 
 CFLAGS+=-lpthread
-
-DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-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)
-

diff --git a/trunk/e_dbus/debian_chinook/rules b/trunk/e_dbus/debian_chinook/rules
deleted file mode 100755 (executable)
index 5c2a962..0000000
--- a/trunk/e_dbus/debian_chinook/rules
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-DEB_CONFIGURE_EXTRA_FLAGS:=--disable-build-test-gui
-CFLAGS+=-lpthread
-
-DEB_BUILD_ARCH?=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-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)
-