diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 02:53:54 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-09 02:53:54 +0100 |
| commit | e3f6a9a0d4232d7ff41d2085641f35a0bf7b229f (patch) | |
| tree | 89d093a894bfb802f5fe4020b36a452f73526f25 /source4/build/smb_build | |
| parent | 17c7f7cc7417e87828fb9e87070f94d7e442e937 (diff) | |
| download | samba-e3f6a9a0d4232d7ff41d2085641f35a0bf7b229f.tar.gz samba-e3f6a9a0d4232d7ff41d2085641f35a0bf7b229f.tar.bz2 samba-e3f6a9a0d4232d7ff41d2085641f35a0bf7b229f.zip | |
Move PC_FILE out of the perl code.
(This used to be commit ca8d4260ada9f74ebc406714ca70d20be09b194b)
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index c5e0ac5a74..ce483d6cfa 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -77,8 +77,6 @@ my $section_types = { "SO_VERSION" => "string", "LIBRARY_REALNAME" => "string", - "PC_FILE" => "string", - "INIT_FUNCTION_TYPE" => "string", "INIT_FUNCTION_SENTINEL" => "string", "OUTPUT_TYPE" => "list", diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index cb7bf7439e..a6abee6106 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -52,9 +52,6 @@ foreach my $key (values %$OUTPUT) { $mkenv->StaticLibraryPrimitives($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}}); - if (defined($key->{PC_FILE})) { - $mkenv->output("PC_FILES += $key->{BASEDIR}/$key->{PC_FILE}\n"); - } $mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if ($key->{TYPE} eq "LIBRARY" and |