X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=debian%2Frules;h=489920724bb9435ae55737c3c88dd5c8d2d24c5d;hb=HEAD;hp=4d2782ec6a6793908ba4caca15d38edb018d5a90;hpb=63ae38a98da5740e0638c868cd1c3f2ac73d2eb2;p=senf.git

diff --git a/debian/rules b/debian/rules
index 4d2782e..4899207 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,57 +19,68 @@ export debian_build
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-#DPKG_ARCH#
-
-CFLAGS = -Wall -g
-
 CONCURRENCY_LEVEL ?= 1
 export CONCURRENCY_LEVEL
 
-LIBTYPE ?= UNSPEC
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 destdir=$(CURDIR)/debian/tmp
 
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-#	# Add here commands to configure the package.
-	rm -f Doxyfile.local SConfig local_config.hh
+#	Add here commands to configure the package.
+#	rm -f Doxyfile.local SConstruct.local senf/local_config.hh
 	scons prepare
 #       If needed, we could create new files 'Doxyfile.local',
-#       'SConfig' and/or 'local_config.hh' here.  We don't remove them
-#       in 'clean' to allow building a source package from an
-#       individually configured svn working copy. (The files are ignored
-#       by dpkg-buildpackge because of appropriate -I arguments provided 
-#       by 'scons deb' and 'scons debsrc'
+#       'SConstruct.local' and/or 'local_config.hh' here.  We don't
+#       remove them in 'clean' to allow building a source package from
+#       an individually configured svn working copy. (The files are
+#       ignored by dpkg-buildpackge because of appropriate -I
+#       arguments provided by 'scons deb' and 'scons debsrc'
 	touch configure-stamp
 
-build: #build-arch build-indep
+build: build-arch build-indep
+
+build-arch: build-arch-debug build-arch-final
+
+build-arch-final: build-arch-final-stamp
+build-arch-final-stamp: configure-stamp
+# 	Add here commands to compile the arch part of the package.
+	scons -j $(CONCURRENCY_LEVEL) $(destdir)/usr/lib $(destdir)/usr/bin \
+		final=1 syslayout=1 \
+		PREFIX='$(destdir)/usr' OBJINSTALLDIR='$$PREFIX/lib/senf/final'
+	touch $@
 
-build-arch: build-arch-$(LIBTYPE)-stamp
-build-arch-$(LIBTYPE)-stamp: configure-stamp
+build-arch-debug: build-arch-debug-stamp
+build-arch-debug-stamp: configure-stamp
 # 	Add here commands to compile the arch part of the package.
-	scons -j $(CONCURRENCY_LEVEL) default $(SCONS_OPTIONS)
+		scons -j $(CONCURRENCY_LEVEL) $(destdir)/usr/lib \
+		LIBADDSUFFIX=_g OBJADDSUFFIX=_g syslayout=1 \
+		PREFIX='$(destdir)/usr' OBJINSTALLDIR='$$PREFIX/lib/senf/debug'
 	touch $@
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp
 # 	Add here commands to compile the indep part of the package.
-	scons -j $(CONCURRENCY_LEVEL) all_docs
-	scons linklint
-	scons fixlinks
+#	scons -j $(CONCURRENCY_LEVEL) all_docs
+#	scons linklint
+#	scons fixlinks
+#	scons $(destdir)/usr/include $(destdir)/usr/share/doc \
+#		syslayout=1 PREFIX='$(destdir)/usr' \
+#		DOCINSTALLDIR='$$PREFIX/share/doc/libsenf-doc/html'
+	scons $(destdir)/usr/include syslayout=1 PREFIX='$(destdir)/usr'
+#       We need to install the example sourcecode
+	find Examples \( -name "*.hh" -o -name "*.cc" -o -name SConstruct \) -printf "%P\n" | \
+		while read src; do \
+			dir="$(destdir)/usr/share/doc/libsenf-doc/examples/$$(dirname "$$src")"; \
+			mkdir -p "$$dir"; \
+			cp "Examples/$$src" "$$dir"; \
+		done
 	touch $@
 
 clean: debclean
 # 	Add here commands to clean up after the build process.
 	-scons -c all
-	-scons -c all LIBSENF=senf_g
+	-scons -c all LIBADDSUFFIX=_g OBJADDSUFFIX=_g
 
 debclean:
 	dh_testdir
@@ -77,36 +88,24 @@ debclean:
 	rm -f build-arch-*-stamp build-indep-stamp configure-stamp
 	dh_clean
 
-install: #install-indep install-arch
+install: install-arch install-indep
 install-indep: build-indep
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i
+	dh_clean -k -i -Xdebian/tmp
 	dh_installdirs -i
 # 	Add here commands to install the indep part of the package into
 # 	debian/<package>-doc.
-	scons $(destdir)/usr/include $(destdir)/usr/share/doc $(SCONS_OPTIONS) \
-		PREFIX='$(destdir)/usr' \
-		DOCINSTALLDIR='$$PREFIX/share/doc/libsenf-doc' \
-		INCLUDEINSTALLDIR='$$PREFIX/include/senf' 
-#       We need to install the example sourcecode
-	find Examples \( -name "*.hh" -o -name "*.cc" \) -printf "%P\n" | \
-		while read src; do \
-			dir="$(destdir)/usr/share/doc/libsenf-doc/examples/$$(dirname "$$src")"; \
-			mkdir -p "$$dir"; \
-			cp "Examples/$$src" "$$dir"; \
-		done
-	dh_install -X.svn -i
+	dh_install -X.svn -X.git -i
 
 install-arch: build-arch
 	dh_testdir
 	dh_testroot
-	dh_clean -k -s
-	dh_installdirs # options provided by DH_OPTIONS
+	dh_clean -k -s -Xdebian/tmp
+	dh_installdirs -s
 # 	Add here commands to install the arch part of the package into 
 # 	debian/tmp.
-	scons $(destdir)/usr/lib $(SCONS_OPTIONS) PREFIX='$(destdir)/usr'
-	dh_install -X.svn # options provided by DH_OPTIONS
+	dh_install -X.svn -X.git -s
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep
@@ -143,24 +142,8 @@ binary-common:
 binary-indep: build-indep install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
-binary-arch: binary-arch-final binary-arch-debug
-
-binary-arch-final:
-	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-s -Nlibsenf-dbg" \
-		SCONS_OPTIONS="final=1" \
-		LIBTYPE="final" \
-			binary-arch-common
-
-binary-arch-debug:
-	$(MAKE) -f debian/rules \
-		DH_OPTIONS="-plibsenf-dbg" \
-		SCONS_OPTIONS="LIBSENF=senf_g" \
-		LIBTYPE="debug" \
-			binary-arch-common
-
-binary-arch-common: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS="$(DH_OPTIONS)" binary-common
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install install-indep install-arch \