From 2a91d4adb5a6c0543b2d1e85b5fb9ddbfbb4c53e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sun, 6 Jul 2008 02:52:09 +0200 Subject: build: move libtalloc related targets together. Michael (This used to be commit 01b1e642d72ecccac5277b5f071aab8f6df04c0d) --- source3/Makefile.in | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'source3/Makefile.in') diff --git a/source3/Makefile.in b/source3/Makefile.in index 57680b275f..a91ae40b35 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1622,6 +1622,8 @@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBTALLOC_OBJ0) +libtalloc: $(LIBTALLOC) + cleanlibtalloc:: -rm -f \ $(LIBTALLOC_SYMS) \ @@ -1629,6 +1631,21 @@ cleanlibtalloc:: $(LIBTALLOC_SHARED_TARGET) \ $(LIBTALLOC_SHARED_TARGET_SONAME) +installlibtalloc:: installdirs libtalloc + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) + -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) + @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` + -ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` + -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include + +uninstalllibtalloc:: + -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` + -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)` + -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)` + -rm -f $(DESTDIR)${prefix}/include/talloc.h + $(LIBTDB_SYMS): $(LIBTDB_HEADERS) @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS) @@ -1717,7 +1734,6 @@ bin/libbigballofmud.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTAL # it can be fixed or if they just can't be called from a static # library. -libtalloc: $(LIBTALLOC) libtdb: $(LIBTDB) libsmbclient: $(LIBSMBCLIENT) libsmbsharemodes: $(LIBSMBSHAREMODES) @@ -2190,21 +2206,6 @@ installclientlib:: installdirs libsmbclient @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include -installlibtalloc:: installdirs libtalloc - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR) - @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` - -ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` - -$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR) - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include - -uninstalllibtalloc:: - -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` - -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)` - -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)` - -rm -f $(DESTDIR)${prefix}/include/talloc.h - installlibtdb:: installdirs libtdb @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET) $(DESTDIR)$(LIBDIR) -- cgit