diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-04 14:16:57 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-04 14:16:57 +0100 |
| commit | 5a5b50f3dd7d75214184f711c35a7536b64cbbe7 (patch) | |
| tree | 489fa463e4e8a49aa485f4904fd8e7254206070d /source4/Makefile | |
| parent | f4f6f849402488e150e9c759e57bfced6e9dfaf0 (diff) | |
| parent | 3ced8006a6a58b459fd68e9b02d7673b16b2df95 (diff) | |
| download | samba-5a5b50f3dd7d75214184f711c35a7536b64cbbe7.tar.gz samba-5a5b50f3dd7d75214184f711c35a7536b64cbbe7.tar.bz2 samba-5a5b50f3dd7d75214184f711c35a7536b64cbbe7.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit 391fea450b2e6664fcd4e4419858997c6094cf3e)
Diffstat (limited to 'source4/Makefile')
| -rw-r--r-- | source4/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/Makefile b/source4/Makefile index 859d168a6f..bdcdf2507e 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -40,7 +40,7 @@ pch:: clean_pch include/includes.h.gch .DEFAULT_GOAL := all -ifneq ($(automatic_deps),yes) +ifneq ($(automatic_dependencies),yes) ALL_PREDEP = proto .NOTPARALLEL: endif @@ -52,7 +52,7 @@ include data.mk DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ include/includes.d -ifeq ($(automatic_deps),yes) +ifeq ($(automatic_dependencies),yes) ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),distclean) ifneq ($(MAKECMDGOALS),realdistclean) |