r15223: Move heimdal's -I parameters from the global list of includes to

the subsystems in question
(This used to be commit 2fbb4d91fa580ccb64e36f0b082f23af33123b13)

7 files changed, 38 insertions, 61 deletions

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 6e8be7fa5e2..8e1645166c6 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -114,7 +114,7 @@ SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
 # Start Ext Lib $1
 @<:@EXT_LIB::EXT_LIB_$1@:>@
 LIBS = $2
-CFLAGS = $3
+EXTRA_CFLAGS = $3
 CPPFLAGS = $4
 LDFLAGS = $5
 # End Ext Lib $1
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 79107c1c9b8..6dfd105c259 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -15,7 +15,7 @@ use strict;
 my $section_types = {
 	"EXT_LIB" => {
 		"LIBS"			=> "list",
-		"CFLAGS"		=> "list",
+		"EXTRA_CFLAGS"		=> "string",
 		"CPPFLAGS"		=> "list",
 		"LDFLAGS"		=> "list",
 		},
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 636fa1fbc57..767edbd496e 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -231,7 +231,6 @@ sub SharedLibrary($$)
 	}
 
 	$self->_prepare_list($ctx, "OBJ_LIST");
-	$self->_prepare_list($ctx, "CFLAGS");
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_LIST");
 	$self->_prepare_list($ctx, "LINK_FLAGS");
@@ -316,7 +315,6 @@ sub MergedObj($$)
 	return unless $ctx->{TARGET};
 
 	$self->_prepare_list($ctx, "OBJ_LIST");
-	$self->_prepare_list($ctx, "CFLAGS");
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 
 	push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
@@ -337,7 +335,6 @@ sub ObjList($$)
 	push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)");
 		
 	$self->_prepare_list($ctx, "OBJ_LIST");
-	$self->_prepare_list($ctx, "CFLAGS");
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->output("$ctx->{TARGET}: ");
 	$self->output("\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n");
@@ -351,7 +348,6 @@ sub StaticLibrary($$)
 	push (@{$self->{static_libs}}, $ctx->{TARGET});
 
 	$self->_prepare_list($ctx, "OBJ_LIST");
-	$self->_prepare_list($ctx, "CFLAGS");
 
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_LIST");
@@ -407,7 +403,6 @@ sub Binary($$)
 	push (@{$self->{binaries}}, "bin/$ctx->{BINARY}");
 
 	$self->_prepare_list($ctx, "OBJ_LIST");
-	$self->_prepare_list($ctx, "CFLAGS");
 	$self->_prepare_list($ctx, "DEPEND_LIST");
 	$self->_prepare_list($ctx, "LINK_LIST");
 	$self->_prepare_list($ctx, "LINK_FLAGS");
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 848286946b9..d344b8ef015 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -136,11 +136,6 @@ sub create_output($$)
 			$part->{OUTPUT_TYPE} = "OBJLIST";
 		}
 
-		if (($part->{STANDARD_VISIBILITY} ne "default") and 
-			($config->{visibility_attribute} eq "yes")) {
-			$part->{EXTRA_CFLAGS} .= " -fvisibility=$part->{STANDARD_VISIBILITY}";
-		}
-
 		generate_binary($part) if $part->{OUTPUT_TYPE} eq "BINARY";
 		generate_mergedobj($part) if $part->{OUTPUT_TYPE} eq "MERGEDOBJ";
 		generate_objlist($part) if $part->{OUTPUT_TYPE} eq "OBJLIST";
@@ -156,22 +151,22 @@ sub create_output($$)
 		foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) {
 			next if $elem == $part;
 
-			push(@{$part->{CPPFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}});
-			push(@{$part->{CFLAGS}}, @{$elem->{CFLAGS}}) if defined(@{$elem->{CFLAGS}});
+			push(@{$part->{CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}});
+			push(@{$part->{CFLAGS}}, $elem->{EXTRA_CFLAGS}) if defined($elem->{EXTRA_CFLAGS});
 			push(@{$part->{LINK_LIST}}, $elem->{OUTPUT}) if defined($elem->{OUTPUT});
 			push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
 			push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
-		    push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
-			push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if 
-				defined($elem->{INIT_FUNCTION}) and 
-				$elem->{TYPE} ne "MODULE" and 
-				$part->{OUTPUT_TYPE} ne "SHARED_LIBRARY";
+		    	push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});
 		}
 	}
 
 	foreach $part (values %{$depend}) {
-		$part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CFLAGS}}) if defined($part->{CFLAGS});
-		$part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CPPFLAGS}}) if defined($part->{CPPFLAGS});
+		$part->{EXTRA_CFLAGS} .= " " . join(' ', @{$part->{CFLAGS}}) if defined($part->{CFLAGS});
+		$part->{EXTRA_CFLAGS} .= " " . join(' ', @{$part->{CPPFLAGS}}) if defined($part->{CPPFLAGS});
+		if (($part->{STANDARD_VISIBILITY} ne "default") and 
+			($config->{visibility_attribute} eq "yes")) {
+			$part->{EXTRA_CFLAGS} .=  " -fvisibility=$part->{STANDARD_VISIBILITY}";
+		}
 	}
 
 	return $depend;
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index f38194ff27b..65368270d9e 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -1,6 +1,7 @@
 #######################
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/kdc
 OBJ_FILES = \
 	../heimdal/kdc/default_config.o \
 	../heimdal/kdc/kerberos5.o \
@@ -11,12 +12,14 @@ OBJ_FILES = \
 	../heimdal/kdc/kerberos4.o \
 	../heimdal/kdc/kaserver.o \
 	../heimdal/kdc/process.o
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB
 # End SUBSYSTEM HEIMDAL_KDC
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_HDB
 [SUBSYSTEM::HEIMDAL_HDB]
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb
 OBJ_FILES = \
 	../heimdal/lib/hdb/db.o \
 	../heimdal/lib/hdb/hdb.o \
@@ -47,6 +50,7 @@ PUBLIC_DEPENDENCIES = HDB_LDB
 #######################
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi
 OBJ_FILES = \
 	../heimdal/lib/gssapi/init_sec_context.o \
 	../heimdal/lib/gssapi/inquire_cred.o \
@@ -87,17 +91,15 @@ OBJ_FILES = \
 	../heimdal/lib/gssapi/get_mic.o \
 	../heimdal/lib/gssapi/import_name.o \
 	../heimdal/lib/gssapi/init.o
-PUBLIC_DEPENDENCIES = KERBEROS HEIMDAL_KRB5
+PUBLIC_DEPENDENCIES = KERBEROS HEIMDAL_KRB5 
 # End SUBSYSTEM HEIMDAL_GSSAPI
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_KRB5]
-EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/kdc \
-	-Iheimdal/lib/des -Iheimdal/lib/roken \
-	-DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1
 OBJ_FILES = \
 	../heimdal/lib/krb5/acache.o \
 	../heimdal/lib/krb5/add_et_list.o \
@@ -187,9 +189,7 @@ OBJ_FILES = \
 # Start SUBSYSTEM HEIMDAL_ASN1
 [SUBSYSTEM::HEIMDAL_ASN1]
 EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/lib/asn1 \
-	-Iheimdal/kdc -Iheimdal/lib/des \
-	-Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+	-Iheimdal_build -Iheimdal/lib/asn1
 OBJ_FILES = \
 	../heimdal/lib/asn1/der_get.o \
 	../heimdal/lib/asn1/der_put.o \
@@ -259,16 +259,15 @@ OBJ_FILES = \
 	../heimdal/lib/asn1/asn1_err.o \
 	../heimdal/lib/asn1/asn1_krb5int32.o \
 	../heimdal/lib/asn1/asn1_krb5uint32.o
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
 
 #######################
 # Start SUBSYSTEM HEIMDAL_DES
 [SUBSYSTEM::HEIMDAL_DES]
-EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/kdc \
-	-Iheimdal/lib/des -Iheimdal/lib/roken \
-	-DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/des 
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
 OBJ_FILES = \
 	../heimdal/lib/des/aes.o \
 	../heimdal/lib/des/des.o \
@@ -296,11 +295,13 @@ OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
+EXTRA_CFLAGS = -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
 [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO]
+EXTRA_CFLAGS = -Iheimdal/lib/roken
 OBJ_FILES = \
 	../heimdal/lib/roken/getaddrinfo.o \
 	../heimdal/lib/roken/freeaddrinfo.o \
@@ -313,9 +314,7 @@ OBJ_FILES = \
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
-EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/kdc \
-	-Iheimdal/lib/des -Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -Iheimdal/lib/roken -Iheimdal_build 
 OBJ_FILES = \
 	../heimdal/lib/roken/base64.o \
 	../heimdal/lib/roken/hex.o \
@@ -349,6 +348,7 @@ PUBLIC_DEPENDENCIES = \
 #######################
 # Start SUBSYSTEM HEIMDAL_GLUE
 [SUBSYSTEM::HEIMDAL_GLUE]
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err
 OBJ_FILES = glue.o
 PUBLIC_DEPENDENCIES = LIBNETIF
 # End SUBSYSTEM HEIMDAL_GLUE
@@ -357,13 +357,11 @@ PUBLIC_DEPENDENCIES = LIBNETIF
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
-EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/lib/com_err \
-	-Iheimdal/kdc -Iheimdal/lib/des \
-	-Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err
 OBJ_FILES = \
 	../heimdal/lib/com_err/com_err.o \
 	../heimdal/lib/com_err/error.o
+PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
 # End SUBSYSTEM HEIMDAL_COM_ERR
 #######################
 
@@ -371,9 +369,7 @@ OBJ_FILES = \
 # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX]
 EXTRA_CFLAGS = -D_GNU_SOURCE \
-	-Iheimdal_build -Iheimdal/lib/asn1 \
-	-Iheimdal/kdc -Iheimdal/lib/des \
-	-Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+	-Iheimdal_build -Iheimdal/lib/asn1
 OBJ_FILES = \
 	../heimdal/lib/asn1/lex.ho 
 # End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
@@ -382,10 +378,7 @@ OBJ_FILES = \
 #######################
 # Start BINARY asn1_compile
 [BINARY::asn1_compile]
-EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/lib/asn1 \
-	-Iheimdal/kdc -Iheimdal/lib/des \
-	-Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Iheimdal/lib/asn1
 OBJ_FILES = \
 	../heimdal/lib/asn1/main.ho \
 	../heimdal/lib/asn1/gen.ho \
@@ -417,10 +410,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX]
-EXTRA_CFLAGS = -D_GNU_SOURCE \
-	-Iheimdal_build -Iheimdal/lib/com_err \
-	-Iheimdal/kdc -Iheimdal/lib/des \
-	-Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -D_GNU_SOURCE -Iheimdal_build -Iheimdal/lib/com_err
 OBJ_FILES = \
 	../heimdal/lib/com_err/lex.ho 
 # End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
@@ -429,10 +419,7 @@ OBJ_FILES = \
 #######################
 # Start BINARY compile_et
 [BINARY::compile_et]
-EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/lib/com_err \
-	-Iheimdal/kdc -Iheimdal/lib/des \
-	-Iheimdal/lib/roken -DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken
 OBJ_FILES = ../heimdal/lib/vers/print_version.ho \
 	../heimdal/lib/com_err/parse.ho \
 	../heimdal/lib/com_err/compile_et.ho \
@@ -485,14 +472,11 @@ clean::
 [LIBRARY::HEIMDAL]
 VERSION = 0.0.1
 SO_VERSION = 0
-EXTRA_CFLAGS = \
-	-Iheimdal_build -Iheimdal/kdc \
-	-Iheimdal/lib/des -Iheimdal/lib/roken \
-	-DNO_PRINTF_ATTRIBUTE
+EXTRA_CFLAGS = -Iheimdal/lib/vers -Iheimdal_build
 OBJ_FILES = ../heimdal/lib/vers/print_version.o
 PUBLIC_DEPENDENCIES = \
 		LIBREPLACE HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \
-		HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN \
+		HEIMDAL_ASN1 HEIMDAL_ROKEN \
 		HEIMDAL_COM_ERR HEIMDAL_GLUE EXT_LIB_RESOLV
 # End SUBSYSTEM HEIMDAL
 #######################
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 76a37be3d86..b4a98ef746c 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -14,11 +14,12 @@ PUBLIC_DEPENDENCIES = \
 #######################
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::HDB_LDB]
+EXTRA_CFLAGS = -Iheimdal/kdc
 OBJ_FILES = \
 		hdb-ldb.o \
 		pac-glue.o 
 PUBLIC_DEPENDENCIES = \
-		ldb KERBEROS_LIB HEIMDAL_HDB auth_sam
+		ldb KERBEROS_LIB HEIMDAL_HDB auth_sam 
 # End SUBSYSTEM KDC
 #######################
 
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index cf6b02dccc2..9297c6b986b 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -7,6 +7,7 @@ INIT_FUNCTION = process_model_single_init
 SUBSYSTEM = process_model
 OBJ_FILES = \
 		process_single.o
+PRIVATE_DEPENDENCIES = KERBEROS_LIB
 # End MODULE process_model_single
 ################################################
 
@@ -18,6 +19,7 @@ SUBSYSTEM = process_model
 OBJ_FILES = \
 		process_standard.o
 PUBLIC_DEPENDENCIES = EXT_LIB_SETPROCTITLE
+PRIVATE_DEPENDENCIES = KERBEROS_LIB
 # End MODULE process_model_standard
 ################################################