diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-14 16:22:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:47 -0500 |
| commit | 8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71 (patch) | |
| tree | 8e8ccaddb94efc6a85ab6c339cab76cea1f44085 /source4/build/smb_build/output.pm | |
| parent | 7367d23713a34a6c29a492adb365292399adffe8 (diff) | |
| download | samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.gz samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.bz2 samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.zip | |
r3733: More build system fixes/features:
- Use .mk files directly (no need for a SMB_*_MK() macro when adding a new SUBSYSTEM, MODULE or BINARY). This allows addition of new modules and subsystems without running configure
- Add support for generating .dot files with the Samba4 dependency tree (as used by the graphviz and springgraph utilities)
(This used to be commit 64826da834e26ee0488674e27a0eae36491ee179)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index b40c566077..7d310670f6 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -25,10 +25,12 @@ sub generate_shared_library($) @{$lib->{DEPEND_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJS)"); @{$lib->{LINK_LIST}} = ("\$($lib->{TYPE}_$lib->{NAME}\_OBJS)"); $lib->{LIBRARY_NAME} = $lib->{NAME}.".so"; - $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{MAJOR_VERSION}"; - $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_SONAME}.".$lib->{MINOR_VERSION}.$lib->{RELEASE_VERSION}"; - - $lib->{OUTPUT} = "bin/$lib->{LIBRARY_SONAME}"; + $lib->{OUTPUT} = "bin/$lib->{LIBRARY_NAME}"; + if ($lib->{MAJOR_VERSION}) { + $lib->{LIBRARY_SONAME} = $lib->{LIBRARY_NAME}.".$lib->{MAJOR_VERSION}"; + $lib->{LIBRARY_REALNAME} = $lib->{LIBRARY_SONAME}.".$lib->{MINOR_VERSION}.$lib->{RELEASE_VERSION}"; + $lib->{OUTPUT} = "bin/$lib->{LIBRARY_REALNAME}"; + } } sub generate_static_library($) @@ -71,8 +73,8 @@ sub create_output($) generate_binary($part) if $part->{OUTPUT_TYPE} eq "BINARY"; generate_objlist($part) if $part->{OUTPUT_TYPE} eq "OBJLIST"; - generate_shared_library($part) if $part->{TYPE} eq "SHARED_LIBRARY"; - generate_static_library($part) if $part->{TYPE} eq "STATIC_LIBRARY"; + generate_shared_library($part) if $part->{OUTPUT_TYPE} eq "SHARED_LIBRARY"; + generate_static_library($part) if $part->{OUTPUT_TYPE} eq "STATIC_LIBRARY"; # Combine object lists push(@{$part->{OBJ_LIST}}, @{$part->{INIT_OBJ_FILES}}) if defined($part->{INIT_OBJ_FILES}); @@ -96,13 +98,13 @@ sub create_output($) push(@{$part->{LINK_LIST}}, @{$elem->{LIBS}}) if defined($elem->{LIBS}); push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS}); - push(@{$part->{MODULE_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if + push(@{$part->{MODULE_INIT_FUNCTIONS}}, @{$elem->{INIT_FUNCTION}}) if $elem->{TYPE} eq "MODULE" and defined($elem->{INIT_FUNCTION}) and $elem->{INIT_FUNCTION} ne "" and $elem->{SUBSYSTEM} eq $part->{NAME}; - push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if + push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, @{$elem->{INIT_FUNCTION}}) if $part->{OUTPUT_TYPE} eq "BINARY" and $elem->{TYPE} eq "SUBSYSTEM" and defined($elem->{INIT_FUNCTION}) and @@ -110,8 +112,6 @@ sub create_output($) } } - print Data::Dumper::Dumper($depend); - return %{$depend}; } |