[Pkg-samba-maint] r879 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-05 15:45:11 +0000 (Thu, 05 Jan 2006)
New Revision: 879

Modified:
   branches/samba4/changelog
   branches/samba4/rules
Log:
Change the order of the makes _yet again_; this time, I've verified
that "make -C source pch all" does indeed break, while "make -C source pch ;
make -C source all" seems to work, so I'm killing the proto part and
splitting them again.


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-05 14:59:17 UTC (rev 878)
+++ branches/samba4/changelog	2006-01-05 15:45:11 UTC (rev 879)
@@ -15,10 +15,9 @@
       syncs with us.
     * Removed debmake comment, it's hardly relevant any more.
     * Remove redundant "package=samba" variable.
-    * Do "make proto pch all" instead of "make proto ; -make pch ; make all";
-      proto should be redundant when using the pch target and will be removed
-      in the future (but its removal triggers a build system bug currently).
-      Since we're more or less guaranteed a recent gcc version, the pch target
+    * Do "make pch ; make all" instead of "make proto ; -make pch ; make all";
+      some build system bug prevents us from just doing "make pch all", but
+      since we're more or less guaranteed a recent gcc version, the pch target
       shouldn't fail, so we won't allow it to.
 
   * debian/control changes:

Modified: branches/samba4/rules
===================================================================
--- branches/samba4/rules	2006-01-05 14:59:17 UTC (rev 878)
+++ branches/samba4/rules	2006-01-05 15:45:11 UTC (rev 879)
@@ -27,7 +27,8 @@
 build: build-stamp
 build-stamp: configure
 	dh_testdir
-	$(MAKE) -C $(SOURCEPATH) proto pch all
+	$(MAKE) -C $(SOURCEPATH) pch
+	$(MAKE) -C $(SOURCEPATH) all
 	$(MAKE) -C $(SOURCEPATH)/pidl all
 	touch $@