r14097: Remove subsystem names when installing modules (they're already installed

in a subsystem-specific directory)
No longer install smb.h as it only contains (internal) constants.
(This used to be commit b76126628c21755bb8d30e72e3044bd1785a2447)

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 69c8d98fc76ee10b36eaf62cf5789a735434e50c..22130b6b7aea7d7518b8decff276bcbe9ffe11d1 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,5 +1,6 @@
 - sonames
 - saner names for some of the .pc files
+- .pc files also when there is a public header?
 - get rid of include/structs.h and include/proto.h
 - add register function to smbtorture
 - improve (un)install scripts (rewrite in perl?)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 415d7321f60fe52e79d60a63f1d62f98af4f2e35..84232219128a9f7070c12e7494b3c7982d911d03 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -275,11 +275,15 @@ sub SharedLibrary($$)
                push (@{$self->{shared_modules}}, "bin/$ctx->{LIBRARY_REALNAME}");
                push (@{$self->{plugins}}, "$installdir/$ctx->{LIBRARY_REALNAME}");
 
-               $self->{install_plugins} .= "\t\@echo Install $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
+               my $fixedname = $ctx->{NAME};
+
+               $fixedname =~ s/^$ctx->{SUBSYSTEM}_//g;
+
+               $self->{install_plugins} .= "\t\@echo Installing $installdir/$ctx->{LIBRARY_REALNAME} as \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
                $self->{install_plugins} .= "\t\@mkdir -p \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/\n";
-               $self->{install_plugins} .= "\t\@cp $installdir/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
-               $self->{uninstall_plugins} .= "\t\@echo Uninstall \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
-               $self->{uninstall_plugins} .= "\t\@rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$ctx->{NAME}.\$(SHLIBEXT)\n";
+               $self->{install_plugins} .= "\t\@cp $installdir/$ctx->{LIBRARY_REALNAME} \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
+               $self->{uninstall_plugins} .= "\t\@echo Uninstalling \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
+               $self->{uninstall_plugins} .= "\t\@-rm \$(DESTDIR)\$(MODULESDIR)/$ctx->{SUBSYSTEM}/$fixedname.\$(SHLIBEXT)\n";
        }
 
        $self->_prepare_list($ctx, "OBJ_LIST");

diff --git a/source4/main.mk b/source4/main.mk
index b1ecdce572e100ca1af75787b6143b91c2d788ba..28d4748edf7c74126f676ca9a433bab0ebe2abeb 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -31,7 +31,7 @@ include scripting/config.mk
 include kdc/config.mk
 include passdb/config.mk
 
-DEFAULT_HEADERS = $(srcdir)/include/smb.h $(srcdir)/include/core.h
+DEFAULT_HEADERS = $(srcdir)/include/core.h
 
 binaries: $(BINARIES)
 libraries: $(STATIC_LIBS) $(SHARED_LIBS)