From 128a3650aa26892e3986c0414cb354cacf648638 Mon Sep 17 00:00:00 2001 From: mazen Date: Mon, 31 Jan 2011 15:17:07 +0000 Subject: [PATCH] MAKE DEB : Use make all to build everything. git-svn-id: trunk@29272 - --- debian/patches/01_topmakefile.diff | 17 +++++++++++------ debian/rules | 7 ++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/debian/patches/01_topmakefile.diff b/debian/patches/01_topmakefile.diff index acf68ba715..98bd34178d 100755 --- a/debian/patches/01_topmakefile.diff +++ b/debian/patches/01_topmakefile.diff @@ -13,12 +13,8 @@ diff -urNad lazarus-0.9.26.1-0~/Makefile.fpc lazarus-0.9.26.1-0/Makefile.fpc exampledirs=examples [compiler] -@@ -45,13 +45,9 @@ - - #----------------------------------------------------------------------------- - [rules] --.PHONY: lcl components packager/registration ideintf bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide cleannogui purge examples install lazbuild -+.PHONY: lcl components packager/registration ideintf bigidecomponents idepkg idebig bigide starter lazbuilder tools all clean cleanide cleannogui purge examples install lazbuild +@@ -48,10 +48,6 @@ + .PHONY: lcl components packager/registration ideintf bigidecomponents ide idepkg idebig bigide starter lazbuilder tools all clean cleanide cleannogui purge examples install lazbuild #----------------------------------------------------------------------------- -ide: @@ -38,3 +34,12 @@ diff -urNad lazarus-0.9.26.1-0~/Makefile.fpc lazarus-0.9.26.1-0/Makefile.fpc #----------------------------------------------------------------------------- examples: lcl components +@@ -88,7 +84,7 @@ tools: lcl + examples: lcl components + + #----------------------------------------------------------------------------- +-all: packager/registration lcl ideintf components ide starter lazbuilder ++all: packager/registration lcl ideintf components bigidecomponents bigide starter lazbuilder tools examples + + #----------------------------------------------------------------------------- + cleannogui: diff --git a/debian/rules b/debian/rules index a7dc94d113..9e1e9ffa16 100755 --- a/debian/rules +++ b/debian/rules @@ -58,7 +58,7 @@ ifndef LAZBUILD LAZBUILD=${CURDIR}/lazbuild endif # Set default compilation options -BUILDOPTS= +BUILDOPTS=USESVN2REVISIONINC=0 INSTALLOPTS=INSTALL_PREFIX=$(INSTALL_DIR)/usr # Configure patch system include /usr/share/quilt/quilt.make @@ -122,11 +122,8 @@ build-arch: debian-files configure build-arch-stamp build-arch-stamp: @echo "--- Building" dh_testdir - $(MAKE) lcl packager/registration ideintf bigidecomponents examples $(BUILDOPTS) - $(MAKE) bigide USESVN2REVISIONINC=0 $(BUILDOPTS) + $(MAKE) all $(BUILDOPTS) ${MV} $(CURDIR)/lazarus $(CURDIR)/lazarus-gtk2 - $(MAKE) lazbuilder $(BUILDOPTS) - $(MAKE) tools $(BUILDOPTS) touch build-arch-stamp install-arch: build-arch install-arch-stamp