Do "make pch all" instead of "make proto ; -make pch ; make all"; proto is

redundant when using the pch target (and since we're more or less guaranteed a
recent gcc version, the pch target shouldn't fail).


git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba4@869 fc4039ab-9d04-0410-8cac-899223bdd6b0

2 files changed, 5 insertions, 4 deletions

diff --git a/changelog b/changelog
index f9a510b06d..21664eec41 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,9 @@ samba (3.9.0+SVN12692-1) UNRELEASED; urgency=low
       syncs with us.
     * Removed debmake comment, it's hardly relevant any more.
     * Remove redundant "package=samba" variable.
+    * Do "make pch all" instead of "make proto ; -make pch ; make all"; proto
+      is redundant when using the pch target (and since we're more or less
+      guaranteed a recent gcc version, the pch target shouldn't fail).
 
   * debian/control changes:
     * Copied Uploaders: line from Samba 3 packaging, adding myself.
@@ -41,7 +44,7 @@ samba (3.9.0+SVN12692-1) UNRELEASED; urgency=low
     versions of Samba 4 won't die when the parent is killed.
   * Updated README.debian somewhat, and renamed to use a capital D.
 
- -- Steinar H. Gunderson <sesse@debian.org>  Wed,  4 Jan 2006 01:50:11 +0100
+ -- Steinar H. Gunderson <sesse@debian.org>  Wed,  4 Jan 2006 16:55:23 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 
diff --git a/rules b/rules
index c46296119b..9133236cd3 100755
--- a/rules
+++ b/rules
@@ -28,9 +28,7 @@ configure-stamp:
 build: build-stamp
 build-stamp: configure
 	dh_testdir
-	$(MAKE) -C $(SOURCEPATH) proto 
-	-$(MAKE) -C $(SOURCEPATH) pch
-	$(MAKE) -C $(SOURCEPATH) all
+	$(MAKE) -C $(SOURCEPATH) pch all
 	$(MAKE) -C $(SOURCEPATH)/pidl all
 	touch $@