diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-27 16:23:12 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-27 16:23:12 +0200 |
| commit | 16c883ca23a23d3784aec059ac949a066c29ac0d (patch) | |
| tree | 22ead13dab3262c48c6a90073f714b3401a86a59 /source4 | |
| parent | fa2216584288813d2c3a507cc01e9a4cb0193130 (diff) | |
| download | samba-16c883ca23a23d3784aec059ac949a066c29ac0d.tar.gz samba-16c883ca23a23d3784aec059ac949a066c29ac0d.tar.bz2 samba-16c883ca23a23d3784aec059ac949a066c29ac0d.zip | |
Move CFLAGS that are not inherited out of smb_build.
(This used to be commit 49dcf4b8811f92684a7ddd266ac289d8fc8ca215)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/config.mk | 9 | ||||
| -rw-r--r-- | source4/lib/ldb/python.mk | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 652a52fa60..8c7d75221c 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -25,7 +25,6 @@ my $section_types = { "PUBLIC_DEPENDENCIES" => "list", "ENABLE" => "bool", "LDFLAGS" => "list", - "CFLAGS" => "list", }, "SUBSYSTEM" => { "PRIVATE_DEPENDENCIES" => "list", @@ -60,7 +59,6 @@ my $section_types = { "ENABLE" => "bool", "INSTALLDIR" => "string", - "CFLAGS" => "list", "LDFLAGS" => "list", "STANDARD_VISIBILITY" => "string", diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 66a2ddbcc9..95cad441f1 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -490,11 +490,11 @@ HEIMDAL_COM_ERR_OBJ_FILES = \ ####################### # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) # End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX ####################### HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/asn1/lex.ho +$(HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/asn1 -I$(heimdalsrcdir)/lib/roken -I$(socketwrappersrcdir) ####################### # Start BINARY asn1_compile @@ -528,7 +528,7 @@ asn1_compile_OBJ_FILES = \ $(socketwrappersrcdir)/socket_wrapper.ho \ $(heimdalbuildsrcdir)/replace.ho -$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken +$(asn1_compile_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken -I$(heimdalsrcdir)/lib/asn1 # End BINARY asn1_compile ####################### @@ -545,7 +545,6 @@ HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = $(heimdalsrcdir)/lib/com_err/lex.ho ####################### # Start BINARY compile_et [BINARY::compile_et] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken USE_HOSTCC = YES PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK # End BINARY compile_et @@ -563,6 +562,7 @@ compile_et_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.ho \ $(socketwrappersrcdir)/socket_wrapper.ho \ $(heimdalbuildsrcdir)/replace.ho +$(compile_et_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken mkinclude perl_path_wrapper.sh asn1_deps.pl lib/hdb/hdb.asn1 hdb_asn1 \$\(heimdalsrcdir\)/lib/hdb | mkinclude perl_path_wrapper.sh asn1_deps.pl lib/gssapi/spnego/spnego.asn1 spnego_asn1 \$\(heimdalsrcdir\)/lib/gssapi --sequence=MechTypeList | @@ -609,7 +609,6 @@ HEIMDAL_OBJ_FILES = $(heimdalsrcdir)/lib/vers/print_version.o ####################### # Start BINARY compile_et [BINARY::samba4kinit] -CFLAGS = -I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM # End BINARY compile_et ####################### @@ -619,5 +618,7 @@ samba4kinit_OBJ_FILES = $(heimdalsrcdir)/kuser/kinit.o \ $(heimdalsrcdir)/lib/roken/setprogname.o \ $(heimdalsrcdir)/lib/roken/getarg.o +$(samba4kinit_OBJ_FILES): CFLAGS+=-I$(heimdalbuildsrcdir) -I$(heimdalsrcdir)/lib/roken + dist:: $(heimdalsrcdir)/lib/asn1/lex.c $(heimdalsrcdir)/lib/com_err/lex.c \ $(heimdalsrcdir)/lib/asn1/parse.c $(heimdalsrcdir)/lib/com_err/parse.c diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk index 96ae6a5720..5325446e1e 100644 --- a/source4/lib/ldb/python.mk +++ b/source4/lib/ldb/python.mk @@ -1,9 +1,9 @@ [PYTHON::swig_ldb] LIBRARY_REALNAME = _ldb.$(SHLIBEXT) PUBLIC_DEPENDENCIES = LIBLDB -CFLAGS = -I$(ldbdir)/include swig_ldb_OBJ_FILES = $(ldbdir)/ldb_wrap.o +$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include $(eval $(call python_py_module_template,ldb.py,$(ldbdir)/ldb.py)) |