diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-17 00:45:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:34 -0500 |
| commit | 5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda (patch) | |
| tree | d3eb0f99fa809a88990b7fb0bf24ec76905e0f9b /source4/build/smb_build | |
| parent | 132310b5bf173d398243991bce5b1fb4c5dc5f96 (diff) | |
| download | samba-5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda.tar.gz samba-5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda.tar.bz2 samba-5c79bbadd5cfa921c8b4f87b5b4cafe5c488ebda.zip | |
r14497: Fix build with shared libraries
(This used to be commit c74fc55831ca24819ae7f5e0920d0351e2b46a08)
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/TODO | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO index dae3fc6cfa..80254b1eda 100644 --- a/source4/build/smb_build/TODO +++ b/source4/build/smb_build/TODO @@ -5,6 +5,7 @@ - include line in Makefile - rule in Makefile - generate headermap.txt +- fix handling of dynconfig.o (causes too much recompiles for asn1_compile) set of test scripts that check the code: - configure_check_unused.pl diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 7bb7dedb53..42ce3889ac 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -256,11 +256,16 @@ __EOD__ } my $soarg = ""; + my $soargdebug = ""; if ($self->{config}->{SONAMEFLAG} ne "" and defined($ctx->{LIBRARY_SONAME})) { $soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} "; } + if ($self->{config}->{SONAMEFLAG} ne "") { + $soargdebug = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_REALNAME} "; + } + if ($self->{duplicate_build}) { $self->output(<< "__EOD__" # @@ -269,7 +274,7 @@ $ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx-> \@echo Linking \$\@ \@mkdir -p $ctx->{DEBUGDIR} \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\ - \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\ + \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soargdebug \\ $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) __EOD__ @@ -393,7 +398,7 @@ sub Binary($$) # bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) \$(builddir)/dynconfig-devel.o \@echo Linking \$\@ - \@\$(CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\ + \@\$(CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \$(builddir)/dynconfig-devel.o |