diff options
| author | Michael Adam <obnox@samba.org> | 2008-07-06 13:07:54 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-07-07 20:33:59 +0200 |
| commit | 9bce1354b66c2637d9ca5b585eb164baa4fed114 (patch) | |
| tree | 78014cce1cf805fc438eb30fcc0edf06d57abd4b /source3 | |
| parent | 435137c16b6d278dac6aa3350cf5b0a58df5cc36 (diff) | |
| download | samba-9bce1354b66c2637d9ca5b585eb164baa4fed114.tar.gz samba-9bce1354b66c2637d9ca5b585eb164baa4fed114.tar.bz2 samba-9bce1354b66c2637d9ca5b585eb164baa4fed114.zip | |
build: move libtdb related definitions and targets to libtdb section in Makefile.in
Michael
(This used to be commit a4de301af48f4e5b4898751e8836bdb434d047a6)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 64f42c6ee7..e69774c3c3 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -143,12 +143,6 @@ CODEPAGEDIR = @codepagedir@ # the directory where pid files go PIDDIR = @piddir@ -LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@ -LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@ -LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@ -LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@ -LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h - LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ LIBADDNS=bin/libaddns.a @LIBADDNS_SHARED@ @@ -246,9 +240,6 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) \ # object file lists ###################################################################### -LIBTDB_OBJ0 = @TDB_OBJS@ -LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) - TDB_OBJ = lib/util_tdb.o \ lib/dbwrap.o lib/dbwrap_tdb.o \ lib/dbwrap_tdb2.o lib/dbwrap_ctdb.o \ @@ -1671,6 +1662,15 @@ uninstalllibtalloc:: # #------------------------------------------------------------------- +LIBTDB_OBJ0 = @TDB_OBJS@ +LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) + +LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@ +LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@ +LIBTDB=$(LIBTDB_STATIC_TARGET) @LIBTDB_SHARED@ +LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@ +LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h + libtdb: $(LIBTDB) $(LIBTDB_SYMS): $(LIBTDB_HEADERS) @@ -1686,6 +1686,13 @@ $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBTDB_OBJ0) +installlibtdb:: installdirs libtdb + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) + -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET) $(DESTDIR)$(LIBDIR) + -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR) + @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include + -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include + #------------------------------------------------------------------- # @@ -2274,13 +2281,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 -installlibtdb:: installdirs libtdb - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET) $(DESTDIR)$(LIBDIR) - -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR) - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include - installlibsmbsharemodes:: installdirs libsmbsharemodes @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) -$(INSTALLLIBCMD_SH) bin/libsmbsharemodes.@SHLIBEXT@ $(DESTDIR)$(LIBDIR) |