Move CFLAGS that are not inherited out of smb_build.

diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 652a52fa60520f61b48769d6d5329fb46da99409..8c7d75221c7162b8ecba3106bde8dd40b39f3f85 100644 (file)
--- a/source/build/smb_build/config_mk.pm
+++ b/source/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/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index 66a2ddbcc9ee4007db49de9be1cf5e69d46f16fb..95cad441f15671528a273c331fe54762ebbe2ab8 100644 (file)
--- a/source/heimdal_build/config.mk
+++ b/source/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/source/lib/ldb/python.mk b/source/lib/ldb/python.mk
index 96ae6a5720cc7c664d32b7977ec0a3822ab6bf9c..5325446e1ee19ab49cc44225f5ff3669a7c86c98 100644 (file)
--- a/source/lib/ldb/python.mk
+++ b/source/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))