diff options
| -rw-r--r-- | source4/build/smb_build/input.pm | 15 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 4 | ||||
| -rw-r--r-- | source4/headermap.txt | 1 | ||||
| -rw-r--r-- | source4/heimdal_build/config.mk | 1 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 9c7ffc850e..6be48fcc67 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -207,13 +207,26 @@ sub import_integrated($$) } } +sub add_implicit($$) +{ + my ($INPUT, $n) = @_; + + $INPUT->{$n} = { + TYPE => "MAKE_RULE", + NAME => $n, + TARGET => lc($n), + LIBS => "\$(".uc($n)."_LIBS)", + CFLAGS => "\$(".uc($n)."_CFLAG)" + }; +} + sub calc_unique_deps($$$$$$$$) { sub calc_unique_deps($$$$$$$$); my ($name, $INPUT, $deps, $udeps, $withlibs, $forward, $pubonly, $busy) = @_; foreach my $n (@$deps) { - die("Dependency unknown: $n (for $name)") unless (defined($INPUT->{$n})); + add_implicit($INPUT, $n) unless (defined($INPUT->{$n})); die("Recursive dependency: $n, list: " . join(',', @$busy)) if (grep (/^$n$/, @$busy)); next if (grep /^$n$/, @$udeps); my $dep = $INPUT->{$n}; diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 0717cd9b0b..3911a11773 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -19,8 +19,8 @@ my $INPUT = {}; my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk"); my $subsys_output_type; -#$subsys_output_type = ["MERGED_OBJ"]; -$subsys_output_type = ["STATIC_LIBRARY"]; +$subsys_output_type = ["MERGED_OBJ"]; +#$subsys_output_type = ["STATIC_LIBRARY"]; my $library_output_type; if ($config::config{USESHARED} eq "true") { diff --git a/source4/headermap.txt b/source4/headermap.txt index acbe81328e..70ca92c01c 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -120,3 +120,4 @@ lib/util/wrap_xattr.h: wrap_xattr.h lib/events/events.h: events/events.h lib/events/events_internal.h: events/events_internal.h libcli/ldap/ldap_ndr.h: ldb/ldap_ndr.h +lib/gencache/gencache.h: gencache.h diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 604516ccf6..1e627967fb 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -412,7 +412,6 @@ OBJ_FILES = \ ../heimdal/lib/roken/estrdup.o \ ../heimdal/lib/roken/erealloc.o \ ../heimdal/lib/roken/simple_exec.o \ - ../heimdal/lib/roken/simple_exec.o \ ../heimdal/lib/roken/strcollect.o \ ../heimdal/lib/roken/rtbl.o \ replace.o diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index bd96d5e8f5..67620fac89 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -118,7 +118,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \ [SUBSYSTEM::LIBCLI_RAW] PRIVATE_PROTO_HEADER = raw/raw_proto.h PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR -LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT) +#LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT) PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS OBJ_FILES = raw/rawfile.o \ raw/smb_signing.o \ |