Author: jelmer Date: 2006-04-26 11:30:57 +0000 (Wed, 26 Apr 2006) New Revision: 15270
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15270 Log: Rename EXTRA_CFLAGS to CFLAGS - initial work on getting DSO's working again. Modified: branches/SAMBA_4_0/source/build/m4/public.m4 branches/SAMBA_4_0/source/build/smb_build/cflags.pm branches/SAMBA_4_0/source/build/smb_build/config_mk.pm branches/SAMBA_4_0/source/build/smb_build/input.pm branches/SAMBA_4_0/source/build/smb_build/output.pm branches/SAMBA_4_0/source/heimdal_build/config.mk branches/SAMBA_4_0/source/kdc/config.mk Changeset: Modified: branches/SAMBA_4_0/source/build/m4/public.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/public.m4 2006-04-26 11:02:46 UTC (rev 15269) +++ branches/SAMBA_4_0/source/build/m4/public.m4 2006-04-26 11:30:57 UTC (rev 15270) @@ -114,7 +114,7 @@ # Start Ext Lib $1 @<:@EXT_LIB::EXT_LIB_$1@:>@ LIBS = $2 -EXTRA_CFLAGS = $3 +CFLAGS = $3 CPPFLAGS = $4 LDFLAGS = $5 # End Ext Lib $1 Modified: branches/SAMBA_4_0/source/build/smb_build/cflags.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/cflags.pm 2006-04-26 11:02:46 UTC (rev 15269) +++ branches/SAMBA_4_0/source/build/smb_build/cflags.pm 2006-04-26 11:30:57 UTC (rev 15270) @@ -14,15 +14,15 @@ foreach my $key (values %{$CTX}) { next unless defined ($key->{OBJ_LIST}); - next unless defined ($key->{EXTRA_CFLAGS}); - next if ($key->{EXTRA_CFLAGS} eq ""); + next unless defined ($key->{CFLAGS}); + next if ($key->{CFLAGS} eq ""); foreach (@{$key->{OBJ_LIST}}) { my $ofile = $_; my $dfile = $_; $dfile =~ s/\.o$/.d/; $dfile =~ s/\.ho$/.d/; - print CFLAGS_TXT "$ofile $dfile: CFLAGS+=$key->{EXTRA_CFLAGS}\n"; + print CFLAGS_TXT "$ofile $dfile: CFLAGS+=$key->{CFLAGS}\n"; } } close(CFLAGS_TXT); Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-04-26 11:02:46 UTC (rev 15269) +++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-04-26 11:30:57 UTC (rev 15270) @@ -15,7 +15,7 @@ my $section_types = { "EXT_LIB" => { "LIBS" => "list", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "CPPFLAGS" => "list", "LDFLAGS" => "list", }, @@ -34,7 +34,7 @@ "PUBLIC_HEADERS" => "list", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "STANDARD_VISIBILITY" => "string" }, "MODULE" => { @@ -55,7 +55,7 @@ "MANPAGE" => "string", "PRIVATE_PROTO_HEADER" => "string", - "EXTRA_CFLAGS" => "string" + "CFLAGS" => "string" }, "BINARY" => { "OBJ_FILES" => "list", @@ -70,7 +70,7 @@ "PUBLIC_PROTO_HEADER" => "string", "PUBLIC_HEADERS" => "list", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "STANDARD_VISIBILITY" => "string" }, "LIBRARY" => { @@ -96,7 +96,7 @@ "PUBLIC_PROTO_HEADER" => "string", "PRIVATE_PROTO_HEADER" => "string", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "STANDARD_VISIBILITY" => "string" } }; Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-26 11:02:46 UTC (rev 15269) +++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-26 11:30:57 UTC (rev 15270) @@ -155,8 +155,8 @@ } } - unless (defined($part->{EXTRA_CFLAGS})) { - $part->{EXTRA_CFLAGS} = ""; + unless (defined($part->{CFLAGS})) { + $part->{CFLAGS} = ""; } unless (defined($part->{PUBLIC_HEADERS})) { Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-26 11:02:46 UTC (rev 15269) +++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-26 11:30:57 UTC (rev 15270) @@ -151,8 +151,8 @@ foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) { next if $elem == $part; - push(@{$part->{CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}}); - push(@{$part->{CFLAGS}}, $elem->{EXTRA_CFLAGS}) if defined($elem->{EXTRA_CFLAGS}); + push(@{$part->{PUBLIC_CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}}); + push(@{$part->{PUBLIC_CFLAGS}}, $elem->{CFLAGS}) if defined($elem->{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}); @@ -161,11 +161,11 @@ } 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->{CFLAGS} .= " " . join(' ', @{$part->{PUBLIC_CFLAGS}}) if defined($part->{PUBLIC_CFLAGS}); + $part->{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}"; + $part->{CFLAGS} .= " -fvisibility=$part->{STANDARD_VISIBILITY}"; } } Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk =================================================================== --- branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-26 11:02:46 UTC (rev 15269) +++ branches/SAMBA_4_0/source/heimdal_build/config.mk 2006-04-26 11:30:57 UTC (rev 15270) @@ -1,7 +1,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_KDC [SUBSYSTEM::HEIMDAL_KDC] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/kdc +CFLAGS = -Iheimdal_build -Iheimdal/kdc OBJ_FILES = \ ../heimdal/kdc/default_config.o \ ../heimdal/kdc/kerberos5.o \ @@ -19,7 +19,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_HDB [SUBSYSTEM::HEIMDAL_HDB] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb +CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb OBJ_FILES = \ ../heimdal/lib/hdb/db.o \ ../heimdal/lib/hdb/hdb.o \ @@ -50,7 +50,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_GSSAPI [SUBSYSTEM::HEIMDAL_GSSAPI] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi +CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi OBJ_FILES = \ ../heimdal/lib/gssapi/init_sec_context.o \ ../heimdal/lib/gssapi/inquire_cred.o \ @@ -98,7 +98,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_KRB5 [SUBSYSTEM::HEIMDAL_KRB5] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 +CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_DES HEIMDAL_ASN1 OBJ_FILES = \ ../heimdal/lib/krb5/acache.o \ @@ -188,7 +188,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_ASN1 [SUBSYSTEM::HEIMDAL_ASN1] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 +CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 OBJ_FILES = \ ../heimdal/lib/asn1/der_get.o \ ../heimdal/lib/asn1/der_put.o \ @@ -265,7 +265,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_DES [SUBSYSTEM::HEIMDAL_DES] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/des +CFLAGS = -Iheimdal_build -Iheimdal/lib/des PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN OBJ_FILES = \ ../heimdal/lib/des/aes.o \ @@ -294,21 +294,21 @@ ####################### # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/roken OBJ_FILES = ../heimdal/lib/roken/inet_aton.o [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/roken OBJ_FILES = ../heimdal/lib/roken/getprogname.o [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_HOST] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/roken OBJ_FILES = ../heimdal/lib/roken/getprogname.ho ####################### # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO [SUBSYSTEM::HEIMDAL_ROKEN_ADDRINFO] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/roken OBJ_FILES = \ ../heimdal/lib/roken/getaddrinfo.o \ ../heimdal/lib/roken/freeaddrinfo.o \ @@ -322,7 +322,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_ROKEN [SUBSYSTEM::HEIMDAL_ROKEN] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/roken OBJ_FILES = \ ../heimdal/lib/roken/base64.o \ ../heimdal/lib/roken/hex.o \ @@ -357,7 +357,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_GLUE [SUBSYSTEM::HEIMDAL_GLUE] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err +CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err OBJ_FILES = glue.o PUBLIC_DEPENDENCIES = LIBNETIF # End SUBSYSTEM HEIMDAL_GLUE @@ -366,7 +366,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_COM_ERR [SUBSYSTEM::HEIMDAL_COM_ERR] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err +CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err OBJ_FILES = \ ../heimdal/lib/com_err/com_err.o \ ../heimdal/lib/com_err/error.o @@ -377,7 +377,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/lib/roken OBJ_FILES = ../heimdal/lib/asn1/lex.ho # End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX ####################### @@ -385,7 +385,7 @@ ####################### # Start BINARY asn1_compile [BINARY::asn1_compile] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/roken OBJ_FILES = \ ../heimdal/lib/asn1/main.ho \ ../heimdal/lib/asn1/gen.ho \ @@ -416,7 +416,7 @@ ####################### # Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX [SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken OBJ_FILES = ../heimdal/lib/com_err/lex.ho # End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX ####################### @@ -424,7 +424,7 @@ ####################### # Start BINARY compile_et [BINARY::compile_et] -EXTRA_CFLAGS = -Iheimdal_build -Iheimdal/lib/roken +CFLAGS = -Iheimdal_build -Iheimdal/lib/roken OBJ_FILES = ../heimdal/lib/vers/print_version.ho \ ../heimdal/lib/com_err/parse.ho \ ../heimdal/lib/com_err/compile_et.ho \ @@ -476,7 +476,7 @@ [LIBRARY::HEIMDAL] VERSION = 0.0.1 SO_VERSION = 0 -EXTRA_CFLAGS = -Iheimdal_build +CFLAGS = -Iheimdal_build OBJ_FILES = ../heimdal/lib/vers/print_version.o PUBLIC_DEPENDENCIES = \ LIBREPLACE HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \ Modified: branches/SAMBA_4_0/source/kdc/config.mk =================================================================== --- branches/SAMBA_4_0/source/kdc/config.mk 2006-04-26 11:02:46 UTC (rev 15269) +++ branches/SAMBA_4_0/source/kdc/config.mk 2006-04-26 11:30:57 UTC (rev 15270) @@ -14,7 +14,7 @@ ####################### # Start SUBSYSTEM KDC [SUBSYSTEM::HDB_LDB] -EXTRA_CFLAGS = -Iheimdal/kdc +CFLAGS = -Iheimdal/kdc OBJ_FILES = \ hdb-ldb.o \ pac-glue.o
