From 232d51e666a9a9dd65579d9c7b5873bafa9f669d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 29 Feb 2008 15:32:33 +0100 Subject: Remove useless include, simplify generated CFLAGS lines in Makefile. (This used to be commit 3157ce9876aa69de54acf3f08e0ee2b16cfaff80) --- source4/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index f9a753eb67..1fddfefce3 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -23,7 +23,6 @@ default: all include rules.mk include data.mk -include extra_cflags.txt DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \ $(srcdir)/version.h -- cgit From bb176a124ee9c36a66092f9a60aa6893ad9555f9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 25 Feb 2008 18:05:47 +0100 Subject: Move automatic dependencies code out of perl code. (This used to be commit 58a93ef94b878ff2d2d0029fc2d443551842e712) --- source4/Makefile | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'source4/Makefile') diff --git a/source4/Makefile b/source4/Makefile index 1fddfefce3..97518ebcb6 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -19,11 +19,39 @@ BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS) HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS) HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS) -default: all +.DEFAULT_GOAL := all + +ifneq ($(automatic_deps),yes) +ALL_PREDEP = proto +.NOTPARALLEL: +endif include rules.mk include data.mk +DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ + include/includes.d + +ifeq ($(automatic_deps),yes) +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(MAKECMDGOALS),distclean) +ifneq ($(MAKECMDGOALS),realdistclean) +ifneq ($(SKIP_DEP_FILES),yes) +-include $(DEP_FILES) +endif +endif +endif +endif + +ifneq ($(SKIP_DEP_FILES),yes) +clean:: + @echo Removing dependency files + @find . -name '*.d' -o -name '*.hd' | xargs rm -f +endif +else +include $(srcdir)/static_deps.mk +endif + DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \ $(srcdir)/version.h -- cgit