svn commit: samba r14097 - in branches/SAMBA_4_0/source: . build/smb_build

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-09 20:41:59 +0000 (Thu, 09 Mar 2006)
New Revision: 14097

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14097

Log:
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.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/main.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/TODO	2006-03-09 20:36:01 UTC (rev 14096)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO	2006-03-09 20:41:59 UTC (rev 14097)
@@ -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?)

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-03-09 20:36:01 UTC (rev 14096)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-03-09 20:41:59 UTC (rev 14097)
@@ -275,11 +275,15 @@
 		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");

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2006-03-09 20:36:01 UTC (rev 14096)
+++ branches/SAMBA_4_0/source/main.mk	2006-03-09 20:41:59 UTC (rev 14097)
@@ -31,7 +31,7 @@
 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)