summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-17 11:25:40 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-18 12:04:59 +1000
commit99caee5eef6e054ad6c94a00e3de869f764954f7 (patch)
treef0b1b50f5ada7b57720425709505c8f4b70b92b5
parent9e9887d3232b335b5494f2d536a1fa8a625de86c (diff)
downloadsamba-99caee5eef6e054ad6c94a00e3de869f764954f7.tar.gz
samba-99caee5eef6e054ad6c94a00e3de869f764954f7.tar.bz2
samba-99caee5eef6e054ad6c94a00e3de869f764954f7.zip
build: Remove more of the s3 special cases in waf: only pidfile.c needs -DCONFIGFILE
-rw-r--r--buildtools/wafsamba/samba3.py6
-rwxr-xr-xsource3/wscript_build8
2 files changed, 7 insertions, 7 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index fef81523c4..369285c395 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -100,12 +100,6 @@ def s3_fix_kwargs(bld, kwargs):
includes += TO_LIST(kwargs['includes'])
kwargs['includes'] = includes
- # some S3 code assumes that CONFIGFILE is set
- cflags = ['-DCONFIGFILE="%s"' % bld.env['CONFIGFILE']]
- if 'cflags' in kwargs:
- cflags += TO_LIST(kwargs['cflags'])
- kwargs['cflags'] = cflags
-
# these wrappers allow for mixing of S3 and S4 build rules in the one build
def SAMBA3_LIBRARY(bld, name, *args, **kwargs):
diff --git a/source3/wscript_build b/source3/wscript_build
index bd9241476c..1781bace42 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -50,7 +50,7 @@ LIB_SRC = '''
${TDB_LIB_SRC}
../lib/util/debug_s3.c
lib/dumpcore.c
- lib/interface.c lib/pidfile.c
+ lib/interface.c
lib/username.c
lib/access.c lib/smbrun.c
lib/wins_srv.c
@@ -789,9 +789,15 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
deps='ndr security NDR_SECURITY samba-util UTIL_TDB ccan',
vars=locals())
+bld.SAMBA3_SUBSYSTEM('pidfile',
+ source='lib/pidfile.c',
+ # only pidfile.c assumes that CONFIGFILE is set
+ cflags = ['-DCONFIGFILE="%s"' % bld.env['CONFIGFILE']])
+
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
deps='''
+ pidfile
samba3util
LIBTSOCKET
NDR_MESSAGING