[Pkg-maemo-commits] r347 ./hildon-fm/debian: * Cleanup rules.

[Loïc Minier]

------------------------------------------------------------
revno: 347
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Tue 2007-07-24 11:45:33 +0200
message:
  * Cleanup rules.
modified:
  debian/changelog
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-24 09:42:14 +0000
+++ b/debian/changelog	2007-07-24 09:45:33 +0000
@@ -4,8 +4,9 @@
   * Merged with Ubuntu's branch.
   * Repack the upstream tarball to drop the debian/.
   * Wrap build-deps and deps.
+  * Cleanup rules.
 
- -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 11:42:08 +0200
+ -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 11:45:28 +0200
 
 libhildonfm (1:1.9.23ubuntu3) gutsy; urgency=low
 

=== modified file 'debian/rules'
--- a/debian/rules	2007-06-08 12:07:16 +0000
+++ b/debian/rules	2007-07-24 09:45:33 +0000
@@ -13,54 +13,45 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-CFLAGS = -Wall -g -Werror
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
+CFLAGS += -Wall -g -Werror -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 # Use soft-float and thumb mode if it is enabled.
-ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
-        CFLAGS += -mthumb
-endif
+CFLAGS += $(if $(findstring thumb,$(DEB_BUILD_OPTIONS)),-mthumb)
+
+configure_flags := \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info \
+		--enable-gtk-doc \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE)
 
 config.status:
 	if [ ! -x configure ]; then ./autogen.sh; fi
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-gtk-doc
-
+	CFLAGS="$(CFLAGS)" ./configure $(configure_flags)
 
 build: build-stamp
-build-stamp:  config.status
+build-stamp: config.status
 	dh_testdir
-
 	# Add here commands to compile the package.
 	$(MAKE)
-
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
-
+	rm -f build-stamp
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
-
 	rm -rf debian/build
-	dh_clean 
+	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
-
 	# Add here commands to install the package into debian/build
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/build
 
@@ -72,26 +63,14 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
-#	dh_installexamples
+	dh_installchangelogs
 	dh_installdocs
 	dh_install --sourcedir=debian/build -v
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
 	dh_installman
 	dh_link
 	dh_strip --dbg-package="libhildonfm2-dbg"
 	dh_compress -Xindex.sgml
 	dh_fixperms
-#	dh_perl
-#	dh_python
 	dh_makeshlibs -V
 	dh_installdeb
 	dh_shlibdeps
@@ -100,4 +79,4 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install