r4817: ccache was being made ineffective on all the build farm machines

because the version number was being auto-updated and included in all
C files. With this change it is only included where needed.
(This used to be commit 520cff73c6dc62ba1050cf7ca5145d50b5f2bb4e)

diff --git a/source4/client/client.c b/source4/client/client.c
index 6449781b3f0f6b927a632c5064fea3cdb734c982..6c777bca5092543448c2e872cfc3f6e88c4dd4bd 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include "dynconfig.h"
 #include "clilist.h"
 #include "lib/cmdline/popt_common.h"

diff --git a/source4/include/includes.h b/source4/include/includes.h
index cc03607e9149fcf38f707edf3df45302fb1df507..cae45435c5c34edc24cfbf58af6993ddaf07b4e4 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -152,7 +152,6 @@ extern int errno;
 #endif
 
 /* Lists, trees, caching, database... */
-#include "version.h"
 #include "xfile.h"
 #define TALLOC_DEPRECATED 1
 #include "lib/talloc/talloc.h"

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index c7bd35cbabe6e4a0e2c42e68391e0bacdd160a84..e440611ee47c694e48779be2b9e52595f8a8a7bd 100644 (file)
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include "dynconfig.h"
 #include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"

diff --git a/source4/lib/fault.c b/source4/lib/fault.c
index ac2d4109fd4f263a6c71ec9b595c2ef9190c90b0..d90281f950c9d74b89b3ee3b9dd9cc732bbd3992 100644 (file)
--- a/source4/lib/fault.c
+++ b/source4/lib/fault.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include "system/wait.h"
 
 static void (*cont_fn)(void *);

diff --git a/source4/libads/ldap.c b/source4/libads/ldap.c
index cd551af7f0c3f1a07ab8331c1574325b4cdc1afa..e4b371e2d5b23aecef41e485d8c7980b6c42b9b3 100644 (file)
--- a/source4/libads/ldap.c
+++ b/source4/libads/ldap.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 
 #ifdef HAVE_LDAP
 

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 33559aa5285f80d365a214a271989fa62e8d05a4..616cf50afb07734e47525ccaaf873a99be1533e8 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -53,6 +53,7 @@
  */
 
 #include "includes.h"
+#include "version.h"
 #include "dynconfig.h"
 #include "system/time.h"
 #include "system/iconv.h"

diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index f0e98221aec4fa3b72175e3683544fe7c45e4861..8d65292cfdafad363982b35957b3a9ee562afc31 100644 (file)
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "version.h"
 #include <pthread.h>
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>