diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 15:21:33 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 15:21:33 +0100 |
| commit | 9be199944d29d8f3c8e25ad96c02c824d2853b54 (patch) | |
| tree | b8900763a2a93e1da1cb93b6f0b1fb7fedf5b186 /source4/Makefile | |
| parent | c8011b5d09390318ea6aa5639a142797128e5dab (diff) | |
| parent | 07f6f9b2115b3df03ac11a0db9bf1c4ff5d513cc (diff) | |
| download | samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.tar.gz samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.tar.bz2 samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.zip | |
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts:
source/Makefile
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/dynconfig.mk
source/scripting/python/config.mk
(This used to be commit 744d9fd8731321abea37b0cb14ca75e1b4654722)
Diffstat (limited to 'source4/Makefile')
| -rw-r--r-- | source4/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source4/Makefile b/source4/Makefile index 6083ee35b5..65f8c2de29 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -41,7 +41,6 @@ endif include build/make/rules.mk include build/make/python.mk include data.mk -include extra_cflags.txt DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ include/includes.d |