From cb697240505d502a5abf86b405d1b786779b076f Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 12 Feb 2008 15:18:56 +0100 Subject: Put talloc lib targets into variables and uses these. LIBTALLOC_STATIC_TARGET and LIBTALLOC_SHARED_TARGET. Michael (This used to be commit d1bec3882908086747e1176a275617700cada097) --- source3/Makefile.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'source3/Makefile.in') 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 -- cgit