unified way of changes for debian/rules

diff --git a/trunk/ecore/debian/rules b/trunk/ecore/debian/rules
index 9304de6..6d48e84 100755 (executable)
--- a/trunk/ecore/debian/rules
+++ b/trunk/ecore/debian/rules
@@ -1,19 +1,15 @@
 #!/usr/bin/make -f
 
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=  --disable-ecore-fb --disable-ecore-directfb --disable-ecore-evas-gl --disable-ecore-evas-dfb --disable-ecore-evas-xrender --disable-ecore-evas-fb --disable-ecore-evas-buffer --disable-openssl --disable-abstract-sockets --disable-ecore-ipc --disable-ecore-dbus --disable-ecore-config --disable-ecore-desktop
 
-
 DEB_CONFIGURE_SCRIPT_ENV += CURL_LIBS="-lcurl"
 
+DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
        CFLAGS := $(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
 endif
 
-#clean::
-#              ./autogen.sh --prefix=/usr --disable-ecore-fb --disable-ecore-directfb --disable-ecore-evas-gl --disable-ecore-evas-dfb --disable-ecore-evas-xrender --disable-ecore-evas-fb --disable-ecore-evas-buffer --disable-openssl --disable-abstract-sockets --disable-ecore-ipc --disable-ecore-dbus --disable-ecore-config --disable-ecore-desktop
-

diff --git a/trunk/eet/debian/rules b/trunk/eet/debian/rules
index 31a4fa8..7692742 100755 (executable)
--- a/trunk/eet/debian/rules
+++ b/trunk/eet/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
 # Rewrote debian/rules to use cdbs.
 
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 ifneq (,$(findstring armel,$(DEB_BUILD_ARCH)))
-        DEB_CONFIGURE_SCRIPT_ENV += CFLAGS="$(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 -mfpu=vfp -mfloat-abi=softfp -mcpu=arm1136jf-s -ffast-math -funsafe-math-optimizations -fno-math-errno -fsingle-precision-constant
 endif
-       
 

diff --git a/trunk/embryo/debian/rules b/trunk/embryo/debian/rules
index 07582a0..58a76e7 100755 (executable)
--- a/trunk/embryo/debian/rules
+++ b/trunk/embryo/debian/rules
@@ -8,6 +8,4 @@ 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
 endif
-       
-#clean::
-#      ./autogen.sh --prefix=/usr
+

diff --git a/trunk/evas/debian/rules b/trunk/evas/debian/rules
index ecd03e0..d4de090 100755 (executable)
--- a/trunk/evas/debian/rules
+++ b/trunk/evas/debian/rules
@@ -1,13 +1,14 @@
 #!/usr/bin/make -f
 
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-software-16-x11 --enable-software-x11 --disable-scale-smooth --disable-pthreads --enable-no-dither-mask --enable-small-dither-mask --disable-fb --disable-xrender-x11 --disable-image-loader-tiff --disable-image-loader-edb --disable-image-loader-gif --disable-image-loader-xpm --disable-image-loader-svg --disable-convert-yuv --disable-convert-8-rgb-332 --disable-convert-8-rgb-666 --disable-convert-8-rgb-232 --disable-convert-8-rgb-222 --disable-convert-8-rgb-221 --disable-convert-8-rgb-121 --disable-convert-8-rgb-111 --disable-convert-16-bgr-565 --disable-convert-16-rgb-555 --disable-convert-16-rgb-444 --disable-convert-16-rgb-ipq --disable-convert-16-rgb-rot-180 --disable-convert-16-rgb-rot-270 --disable-convert-16-rgb-rot-90 --disable-convert-24-rgb-888 --disable-convert-24-bgr-888 --disable-convert-32-rgb-8888 --disable-convert-32-rgbx-8888 --disable-convert-32-bgr-8888 --disable-convert-32-bgrx-8888 --disable-convert-32-rgb-rot-0 --disable-convert-32-rgb-rot-180 --disable-convert-32-rgb-rot-270 --disable-convert-32-rgb-rot-90  
+
+
+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
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-software-16-x11 --enable-software-x11 --disable-scale-smooth --disable-pthreads --enable-no-dither-mask --enable-small-dither-mask --disable-fb --disable-xrender-x11 --disable-image-loader-tiff --disable-image-loader-edb --disable-image-loader-gif --disable-image-loader-xpm --disable-image-loader-svg --disable-convert-yuv --disable-convert-8-rgb-332 --disable-convert-8-rgb-666 --disable-convert-8-rgb-232 --disable-convert-8-rgb-222 --disable-convert-8-rgb-221 --disable-convert-8-rgb-121 --disable-convert-8-rgb-111 --disable-convert-16-bgr-565 --disable-convert-16-rgb-555 --disable-convert-16-rgb-444 --disable-convert-16-rgb-ipq --disable-convert-16-rgb-rot-180 --disable-convert-16-rgb-rot-270 --disable-convert-16-rgb-rot-90 --disable-convert-24-rgb-888 --disable-convert-24-bgr-888 --disable-convert-32-rgb-8888 --disable-convert-32-rgbx-8888 --disable-convert-32-bgr-8888 --disable-convert-32-bgrx-8888 --disable-convert-32-rgb-rot-0 --disable-convert-32-rgb-rot-180 --disable-convert-32-rgb-rot-270 --disable-convert-32-rgb-rot-90  
-