[SCM] Samba Shared Repository - branch master updated - 13feda897aca727bc87e4a84f4373df3737793ba

[Jelmer Vernooij]

The branch, master has been updated
       via  13feda897aca727bc87e4a84f4373df3737793ba (commit)
       via  8ada2737005d8a5f065949ba13da43ef72c17d45 (commit)
      from  b2f59ac4ce01b05ceda407cf37dcfd77ea049e6c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 13feda897aca727bc87e4a84f4373df3737793ba
Merge: 8ada2737005d8a5f065949ba13da43ef72c17d45 b2f59ac4ce01b05ceda407cf37dcfd77ea049e6c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 02:06:05 2008 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 8ada2737005d8a5f065949ba13da43ef72c17d45
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Dec 23 01:53:38 2008 +0100

    Use make variable for Samba 4 shared library output directory.

-----------------------------------------------------------------------

Summary of changes:
 source3/samba4.m4                 |    6 +++---
 source3/samba4.mk                 |    5 ++---
 source4/Makefile                  |    3 ++-
 source4/build/make/rules.mk       |    2 +-
 source4/build/smb_build/output.pm |    2 +-
 source4/configure.ac              |    6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/samba4.m4 b/source3/samba4.m4
index f462875..02f0e85 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -120,10 +120,10 @@ AC_SUBST(INTERN_LDFLAGS)
 AC_SUBST(INSTALL_LINK_FLAGS)
 if test $USESHARED = "true";
 then
-	INTERN_LDFLAGS="-L\${builddir}/bin/shared -L\${builddir}/bin/static"
-	INSTALL_LINK_FLAGS="-Wl,-rpath-link,\${builddir}/bin/shared";
+	INTERN_LDFLAGS="-L\$(shliboutputdir) -L\${builddir}/bin/static"
+	INSTALL_LINK_FLAGS="-Wl,-rpath-link,\$(shliboutputdir)";
 else
-	INTERN_LDFLAGS="-L\${builddir}/bin/static -L\${builddir}/bin/shared"
+	INTERN_LDFLAGS="-L\${builddir}/bin/static -L\$(shliboutputdir)"
 fi
 
 dnl Samba 4 files
diff --git a/source3/samba4.mk b/source3/samba4.mk
index 3f4fff4..a374e81 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -6,6 +6,7 @@ HOSTLD = $(CC)
 PARTLINK = $(PROG_LD) -r
 MDLD = $(SHLD)
 MDLD_FLAGS = $(LDSHFLAGS) 
+shliboutputdir = bin/shared
 
 samba4srcdir = $(srcdir)/../source4
 
@@ -59,8 +60,6 @@ endif
 	@mkdir -p $(@D)
 	@$(AR) -rc $@ $^
 
-INTERN_LDFLAGS = -L${builddir}/bin/static -L${builddir}/bin/shared
-
 pidldir = $(samba4srcdir)/../pidl
 include $(pidldir)/config.mk
 include samba4-config.mk
@@ -151,7 +150,7 @@ clean::
 	@-find $(samba4srcdir) -name '*.ho' -exec rm -f '{}' \;
 	@echo Removing samba 4 libraries
 	@-rm -f $(STATIC_LIBS) $(SHARED_LIBS)
-	@-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT) bin/mergedobj/*.o
+	@-rm -f bin/static/*.a $(shliboutputdir)/*.$(SHLIBEXT) bin/mergedobj/*.o
 	@echo Removing samba 4 modules
 	@-rm -f bin/modules/*/*.$(SHLIBEXT)
 	@-rm -f bin/*_init_module.c
diff --git a/source4/Makefile b/source4/Makefile
index 2d49efb..442a62e 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -15,6 +15,7 @@ torturedir = ../lib/torture
 swatdir = $(datadir)/swat
 setupdir = $(datadir)/setup
 ncalrpcdir = $(localstatedir)/ncalrpc
+shliboutputdir = $(builddir)/bin/shared
 
 BNLD = $(LD)
 BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
@@ -155,7 +156,7 @@ manpages:: $(MANPAGES)
 all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
 
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(builddir)/bin/shared
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir)
 
 # 'make testsuite' creates all binaries which are
 # needed by samba3's 'make test' and the build-farm
diff --git a/source4/build/make/rules.mk b/source4/build/make/rules.mk
index 0beb0e2..6898432 100644
--- a/source4/build/make/rules.mk
+++ b/source4/build/make/rules.mk
@@ -45,7 +45,7 @@ clean:: clean_pch
 	@-find . -name '*.ho' -exec rm -f '{}' \;
 	@echo Removing libraries
 	@-rm -f $(STATIC_LIBS) $(SHARED_LIBS)
-	@-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT) bin/mergedobj/*.o
+	@-rm -f bin/static/*.a $(shliboutputdir)/*.$(SHLIBEXT) bin/mergedobj/*.o
 	@echo Removing modules
 	@-rm -f bin/modules/*/*.$(SHLIBEXT)
 	@-rm -f bin/*_init_module.c
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 76c6d3f..aada681 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -40,7 +40,7 @@ sub generate_shared_library($)
 			$lib->{LIBRARY_REALNAME} =~ s/^$sane_subsystem\_//g;
 			$lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)";
 		} else {
-			$lib->{SHAREDDIR} = "bin/shared";
+			$lib->{SHAREDDIR} = "\$(shliboutputdir)";
 			$lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
 		}
 	}
diff --git a/source4/configure.ac b/source4/configure.ac
index b2c169c..aa5a3f3 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -149,10 +149,10 @@ AC_SUBST(INTERN_LDFLAGS)
 AC_SUBST(INSTALL_LINK_FLAGS)
 if test $USESHARED = "true";
 then
-	INTERN_LDFLAGS="-L\${builddir}/bin/shared -L\${builddir}/bin/static"
-	INSTALL_LINK_FLAGS="-Wl,-rpath-link,\${builddir}/bin/shared";
+	INTERN_LDFLAGS="-L\$(shliboutputdir) -L\${builddir}/bin/static"
+	INSTALL_LINK_FLAGS="-Wl,-rpath-link,\$(shliboutputdir)";
 else
-	INTERN_LDFLAGS="-L\${builddir}/bin/static -L\${builddir}/bin/shared"
+	INTERN_LDFLAGS="-L\${builddir}/bin/static -L\$(shliboutputdir)"
 fi
 
 builddir_headers=""


-- 
Samba Shared Repository