summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/build/smb_build/makefile.pm12
-rw-r--r--source4/main.mk2
3 files changed, 10 insertions, 5 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 69c8d98fc7..22130b6b7a 100644
--- 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 415d7321f6..8423221912 100644
--- 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 b1ecdce572..28d4748edf 100644
--- 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)