From f800cf250f079ab1e1bc1051c34d1d1061187447 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 14:51:57 +0200
Subject: Move standard make compilation rules to build/make. (This used to be
 commit ceda3312a98b069d0711f3cb33de3ae71e91ebaa)

---
 source4/Makefile | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'source4/Makefile')

diff --git a/source4/Makefile b/source4/Makefile
index ab3ef47fed..8c74b4899d 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -19,6 +19,25 @@ BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
 HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 
+$(srcdir)/version.h: $(srcdir)/VERSION
+	@$(SHELL) script/mkversion.sh VERSION $(srcdir)/version.h $(srcdir)/
+
+.DEFAULT_GOAL := all
+
+ifneq ($(automatic_deps),yes)
+ALL_PREDEP = proto
+.NOTPARALLEL:
+endif
+
+regen_version::
+	@$(SHELL) script/mkversion.sh VERSION $(srcdir)/version.h $(srcdir)/
+
+clean_pch::
+	@echo "Removing precompiled headers"
+	@-rm -f include/includes.h.gch
+
+pch:: clean_pch include/includes.h.gch
+
 .DEFAULT_GOAL := all
 
 ifneq ($(automatic_dependencies),yes)
@@ -26,9 +45,12 @@ ALL_PREDEP = proto
 .NOTPARALLEL:
 endif
 
-include rules.mk
+include build/make/rules.mk
+include build/make/python.mk
 include data.mk
 
+BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
+
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
 		   include/includes.d
 
@@ -55,7 +77,7 @@ endif
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
 		  $(srcdir)/version.h
 
-binaries::
+binaries:: $(BINARIES)
 libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
 modules:: $(PLUGINS)
 headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
-- 
cgit 


From 76a7ea3dc438d7259fb569410b0faff112e54d4a Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 14 Apr 2008 16:41:46 +0200
Subject: Makefile: fix variable name automatic_deps -> automatic_dependencies

metze
(This used to be commit 7ffc44b7c126dc08d928e63af30111b2c556146f)
---
 source4/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/Makefile')

diff --git a/source4/Makefile b/source4/Makefile
index 8c74b4899d..98c45a34ad 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -24,7 +24,7 @@ $(srcdir)/version.h: $(srcdir)/VERSION
 
 .DEFAULT_GOAL := all
 
-ifneq ($(automatic_deps),yes)
+ifneq ($(automatic_dependencies),yes)
 ALL_PREDEP = proto
 .NOTPARALLEL:
 endif
-- 
cgit 


From d04926914ad0d9ecd7dee3e156198d6baf788598 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 15 Apr 2008 01:40:32 +0200
Subject: Fix the build. (This used to be commit
 ecaa5bb83b5cf319718d15aff96152d70fa19f7f)

---
 source4/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/Makefile')

diff --git a/source4/Makefile b/source4/Makefile
index 98c45a34ad..f2567e6ac4 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -51,6 +51,8 @@ include data.mk
 
 BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
 
+pythonmods:: $(PYTHON_PYS) $(PYTHON_SO)
+
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
 		   include/includes.d
 
-- 
cgit