From 8451b2658ca0f44f2683bf8045a9232a4a8c9660 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 18 Jan 2005 09:30:43 +0000
Subject: 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)

---
 source4/client/client.c           | 1 +
 source4/include/includes.h        | 1 -
 source4/lib/cmdline/popt_common.c | 1 +
 source4/lib/fault.c               | 1 +
 source4/libads/ldap.c             | 1 +
 source4/param/loadparm.c          | 1 +
 source4/smbd/process_thread.c     | 1 +
 7 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/client/client.c b/source4/client/client.c
index 6449781b3f..6c777bca50 100644
--- 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 cc03607e91..cae45435c5 100644
--- 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 c7bd35cbab..e440611ee4 100644
--- 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 ac2d4109fd..d90281f950 100644
--- 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 cd551af7f0..e4b371e2d5 100644
--- 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 33559aa528..616cf50afb 100644
--- 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 f0e98221ae..8d65292cfd 100644
--- 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>
-- 
cgit