diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-08-18 16:25:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:42 -0500 |
| commit | 986461b6be03eefd3bd9d9c5f5921e14189813b2 (patch) | |
| tree | f0a6fba525638e901ac09024728d44253b48de43 /source3/Makefile.in | |
| parent | 41a4496b20e510dc47fe2b816196cef6fe937cea (diff) | |
| download | samba-986461b6be03eefd3bd9d9c5f5921e14189813b2.tar.gz samba-986461b6be03eefd3bd9d9c5f5921e14189813b2.tar.bz2 samba-986461b6be03eefd3bd9d9c5f5921e14189813b2.zip | |
r17607: Adapt the Samba4 directory structure for tdb. Makes it easier to diff.
Let's see what it breaks. For me it works :-)
Volker
(This used to be commit 337be14b432e5dfd80c7418b2db4fe0087259b77)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 0ff5872063..8f4f50a41a 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -116,7 +116,7 @@ LIBSMBSHAREMODES=bin/libsmbsharemodes.a @LIBSMBSHAREMODES_SHARED@ LIBSMBSHAREMODES_MAJOR=0 LIBSMBSHAREMODES_MINOR=2 -FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_ +FLAGS1 = $(CFLAGS) @FLAGS1@ -Iinclude -I$(srcdir)/include -I$(srcdir)/tdb/include @SMBWRAP_INC@ -I. $(CPPFLAGS) -I$(srcdir) -D_SAMBA_BUILD_ FLAGS2 = FLAGS3 = FLAGS4 = @@ -176,10 +176,11 @@ MODULES = $(VFS_MODULES) $(PDB_MODULES) $(RPC_MODULES) $(IDMAP_MODULES) $(CHARSE # object file lists ###################################################################### -TDBBASE_OBJ = tdb/tdb.o tdb/dump.o tdb/error.o tdb/freelist.o tdb/io.o \ - tdb/lock.o tdb/open.o tdb/transaction.o tdb/traverse.o +TDBBASE_OBJ = tdb/common/tdb.o tdb/common/dump.o tdb/common/error.o \ + tdb/common/freelist.o tdb/common/io.o tdb/common/lock.o \ + tdb/common/open.o tdb/common/transaction.o tdb/common/traverse.o -TDB_OBJ = $(TDBBASE_OBJ) tdb/tdbutil.o tdb/tdbback.o +TDB_OBJ = $(TDBBASE_OBJ) tdb/common/tdbutil.o tdb/common/tdbback.o SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@ @@ -545,7 +546,7 @@ CAC_OBJ = $(LIBSMBCLIENT_OBJ) \ libmsrpc/cac_lsarpc.o libmsrpc/cac_winreg.o libmsrpc/cac_samr.o \ libmsrpc/cac_svcctl.o -LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o tdb/tdb.o +LIBSMBSHAREMODES_OBJ = libsmb/smb_share_modes.o $(TDB_BASE_OBJ) # This shared library is intended for linking with unit test programs # to test Samba internals. It's called libbigballofmud.so to @@ -751,11 +752,12 @@ POPT_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ INIPARSER_OBJ = iniparser/src/iniparser.o iniparser/src/dictionary.o \ iniparser/src/strlib.o -TDBBACKUP_OBJ = tdb/tdbbackup.o tdb/tdbback.o $(SNPRINTF_OBJ) $(TDBBASE_OBJ) +TDBBACKUP_OBJ = tdb/tools/tdbbackup.o tdb/common/tdbback.o $(SNPRINTF_OBJ) \ + $(TDBBASE_OBJ) -TDBTOOL_OBJ = tdb/tdbtool.o $(TDBBASE_OBJ) $(SNPRINTF_OBJ) +TDBTOOL_OBJ = tdb/tools/tdbtool.o $(TDBBASE_OBJ) $(SNPRINTF_OBJ) -TDBDUMP_OBJ = tdb/tdbdump.o $(TDBBASE_OBJ) $(SNPRINTF_OBJ) +TDBDUMP_OBJ = tdb/tools/tdbdump.o $(TDBBASE_OBJ) $(SNPRINTF_OBJ) NTLM_AUTH_OBJ1 = utils/ntlm_auth.o utils/ntlm_auth_diagnostics.o @@ -1655,6 +1657,7 @@ TOPFILES=dynconfig.o dynconfig.@PICSUFFIX@ clean: delheaders python_clean -rm -f core */*~ *~ */*.o */*.@PICSUFFIX@ */*.@SHLIBEXT@ \ + tdb/*/*.o tdb/*/*.@PICSUFFIX@ tdb/*/*.@SHLIBEXT@ \ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \ $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) \ $(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBMSRPC) \ |