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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-04 17:04:06 +0000 (Wed, 04 Jan 2006)
New Revision: 871

Modified:
   branches/samba4/changelog
   branches/samba4/rules
Log:
Reinstate "make proto", since just "make pch all" triggers a build 
system bug currently (and "make proto pch all" is a lot better than
"-make pch all ; make all" which seems to be the other workaround).


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-04 17:02:18 UTC (rev 870)
+++ branches/samba4/changelog	2006-01-04 17:04:06 UTC (rev 871)
@@ -15,9 +15,11 @@
       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).
+    * 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
+      shouldn't fail, so we won't allow it to.
 
   * debian/control changes:
     * Copied Uploaders: line from Samba 3 packaging, adding myself.

Modified: branches/samba4/rules
===================================================================
--- branches/samba4/rules	2006-01-04 17:02:18 UTC (rev 870)
+++ branches/samba4/rules	2006-01-04 17:04:06 UTC (rev 871)
@@ -28,7 +28,7 @@
 build: build-stamp
 build-stamp: configure
 	dh_testdir
-	$(MAKE) -C $(SOURCEPATH) pch all
+	$(MAKE) -C $(SOURCEPATH) proto pch all
 	$(MAKE) -C $(SOURCEPATH)/pidl all
 	touch $@