Added specific build options depending on the target device

diff --git a/trunk/e_dbus/debian/rules b/trunk/e_dbus/debian/rules
index 03d420d..d2dd179 100755 (executable)
--- a/trunk/e_dbus/debian/rules
+++ b/trunk/e_dbus/debian/rules
@@ -8,9 +8,13 @@ DEB_CONFIGURE_EXTRA_FLAGS :=  --disable-build-test-gui
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS += -lpthread
-
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
+       endif
 endif
 

diff --git a/trunk/ecore/debian/rules b/trunk/ecore/debian/rules
index 8045678..8a138c6 100755 (executable)
--- a/trunk/ecore/debian/rules
+++ b/trunk/ecore/debian/rules
@@ -18,10 +18,8 @@ DEB_CONFIGURE_SCRIPT_ENV += CURL_LIBS="-lcurl"
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -I/usr/X11R6/include
-                                                                                
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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

diff --git a/trunk/edje/debian/rules b/trunk/edje/debian/rules
index 9609f36..cb7fcf5 100755 (executable)
--- a/trunk/edje/debian/rules
+++ b/trunk/edje/debian/rules
@@ -6,15 +6,13 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2
-                                                                                                                  
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-        CFLAGS += -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
-        endif
+       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
+       endif
 endif
 

diff --git a/trunk/eet/debian/rules b/trunk/eet/debian/rules
index d4e56da..e94e71f 100755 (executable)
--- a/trunk/eet/debian/rules
+++ b/trunk/eet/debian/rules
@@ -6,15 +6,13 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2
-
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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 
+                CFLAGS += -mcpu=arm926ej-s
        endif
 endif
 

diff --git a/trunk/embryo/debian/rules b/trunk/embryo/debian/rules
index 4efb562..9444fbb 100755 (executable)
--- a/trunk/embryo/debian/rules
+++ b/trunk/embryo/debian/rules
@@ -5,16 +5,14 @@ include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2
                                                                                  
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-        CFLAGS += -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
-        endif
+       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
+       endif
 endif
 

diff --git a/trunk/epeg/debian/rules b/trunk/epeg/debian/rules
index 495b7e2..cb7fcf5 100755 (executable)
--- a/trunk/epeg/debian/rules
+++ b/trunk/epeg/debian/rules
@@ -6,10 +6,8 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2
-                                                                                                                  
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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

diff --git a/trunk/epsilon/debian/rules b/trunk/epsilon/debian/rules
index e7bf183..f6328f0 100755 (executable)
--- a/trunk/epsilon/debian/rules
+++ b/trunk/epsilon/debian/rules
@@ -7,6 +7,11 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
+       endif
 endif
-

diff --git a/trunk/etk/debian/rules b/trunk/etk/debian/rules
index 6bfd1ec..4e987df 100755 (executable)
--- a/trunk/etk/debian/rules
+++ b/trunk/etk/debian/rules
@@ -9,5 +9,12 @@ DEB_CONFIGURE_EXTRA_FLAGS := --disable-ecore-fb-x11-support
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
+       endif
 endif
+

diff --git a/trunk/evas/debian/rules b/trunk/evas/debian/rules
index 3062506..3fdf303 100755 (executable)
--- a/trunk/evas/debian/rules
+++ b/trunk/evas/debian/rules
@@ -44,10 +44,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-software-16-x11                        \
 
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2
-
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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

diff --git a/trunk/imlib2/debian/rules b/trunk/imlib2/debian/rules
index 42e2a11..a9432b7 100755 (executable)
--- a/trunk/imlib2/debian/rules
+++ b/trunk/imlib2/debian/rules
@@ -12,6 +12,12 @@ DEB_CONFIGURE_EXTRA_FLAGS := --disable-mmx           \
 DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-       CFLAGS += -DNDEBUG=1 -fomit-frame-pointer -O2 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
+       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
+       endif
 endif