diff options
| author | Michael Adam <obnox@samba.org> | 2008-02-12 15:18:56 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-02-13 09:25:31 +0100 |
| commit | cb697240505d502a5abf86b405d1b786779b076f (patch) | |
| tree | e07be810796e745dbd50a0c792969d788a76815a | |
| parent | 79a3ed88cca77a0c5b5f245d039e5b454545bfe4 (diff) | |
| download | samba-cb697240505d502a5abf86b405d1b786779b076f.tar.gz samba-cb697240505d502a5abf86b405d1b786779b076f.tar.bz2 samba-cb697240505d502a5abf86b405d1b786779b076f.zip | |
Put talloc lib targets into variables and uses these.
LIBTALLOC_STATIC_TARGET and LIBTALLOC_SHARED_TARGET.
Michael
(This used to be commit d1bec3882908086747e1176a275617700cada097)
| -rw-r--r-- | source3/Makefile.in | 12 | ||||
| -rw-r--r-- | source3/configure.in | 10 |
2 files changed, 14 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 01aba442da..cec09ff06b 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -141,7 +141,9 @@ CODEPAGEDIR = @codepagedir@ # the directory where pid files go PIDDIR = @piddir@ -LIBTALLOC=bin/libtalloc.a @LIBTALLOC_SHARED@ +LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@ +LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@ +LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) @LIBTALLOC_SHARED@ LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@ @@ -1441,13 +1443,13 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBWBCLIENT_SHARED@ @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \ $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) @WINBIND_LIBS@ -bin/libtalloc.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBTALLOC_OBJ) +$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) @echo Linking shared library $@ @$(SHLD_DSO) $(LIBTALLOC_OBJ) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @ln -s -f `basename $@` $@.$(SONAME_VER) -bin/libtalloc.a: $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) +$(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBTALLOC_OBJ0) @@ -1955,8 +1957,8 @@ installclientlib: installdirs libsmbclient installlibtalloc: installdirs libtalloc @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) bin/libtalloc.@SHLIBEXT@ $(DESTDIR)$(LIBDIR) - -$(INSTALLLIBCMD_A) bin/libtalloc.a $(DESTDIR)$(LIBDIR) + -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR) + -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) @tallocdir@/talloc.h $(DESTDIR)${prefix}/include installlibsmbsharemodes: installdirs libsmbsharemodes diff --git a/source3/configure.in b/source3/configure.in index 34fac655c4..81296abde0 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -332,6 +332,8 @@ AC_SUBST(UNINSTALL_LIBADDNS) AC_SUBST(LIBADDNS_SHARED) AC_SUBST(LIBADDNS) +AC_SUBST(LIBTALLOC_STATIC_TARGET) +AC_SUBST(LIBTALLOC_SHARED_TARGET) AC_SUBST(INSTALL_LIBTALLOC) AC_SUBST(UNINSTALL_LIBTALLOC) AC_SUBST(LIBTALLOC_SHARED) @@ -5164,6 +5166,8 @@ AC_ARG_WITH([static-libs], # should we build libtalloc? INSTALL_LIBTALLOC= UNINSTALL_LIBTALLOC= +LIBTALLOC_SHARED_TARGET=bin/libtalloc.$SHLIBEXT +LIBTALLOC_STATIC_TARGET=bin/libtalloc.a LIBTALLOC_SHARED= LIBTALLOC= LIBTALLOC_STATIC= @@ -5190,10 +5194,10 @@ samba_cv_with_libtalloc=yes ) if test x"$samba_cv_with_libtalloc" = "xyes" -a $BLDSHARED = true; then - LIBTALLOC_SHARED=bin/libtalloc.$SHLIBEXT + LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET AC_MSG_RESULT(yes) if test x"$LIB_TALLOC" = "xSTATIC" ; then - LIBTALLOC_STATIC=bin/libtalloc.a + LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET else LIBTALLOC_LIBS=-ltalloc fi @@ -5202,7 +5206,7 @@ else AC_MSG_RESULT(no shared library support -- will supply static library) fi if test $enable_static = yes; then - LIBTALLOC_STATIC=bin/libtalloc.a + LIBTALLOC_STATIC=$LIBTALLOC_STATIC_TARGET fi LIBTALLOC=libtalloc INSTALL_LIBTALLOC=installlibtalloc |