git.samba.org / kai / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added a nasty lock testing program
[kai/samba.git] / source / Makefile.in
diff --git a/source/Makefile.in b/source/Makefile.in
index d2c5a289c6ed385615dee1a94eebd3c5afd27000..076820ac7f1da496c705fb349b908f6200e7d82c 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -97,6 +97,8 @@ QUOTAOBJS=@QUOTAOBJS@
 # object file lists
 ######################################################################
 
+TDB_OBJ = tdb/tdb.o tdb/tdbutil.o 
+
 LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \
           lib/getsmbpass.o lib/interface.o lib/kanji.o lib/md4.o \
           lib/interfaces.o lib/pidfile.o lib/replace.o \
@@ -105,15 +107,21 @@ LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \
          lib/bitmap.o lib/crc32.o lib/snprintf.o \
          lib/util_array.o lib/util_str.o lib/util_sid.o \
          lib/util_unistr.o lib/util_file.o \
-         lib/util.o lib/util_sock.o lib/util_sec.o smbd/ssl.o lib/fnmatch.o \
-         tdb/tdb.o lib/talloc.o lib/hash.o
+         lib/util.o lib/util_sock.o lib/util_sec.o smbd/ssl.o \
+         lib/talloc.o lib/hash.o lib/substitute.o lib/fsusage.o \
+         lib/ms_fnmatch.o \
+         $(TDB_OBJ)
 
 UBIQX_OBJ = ubiqx/ubi_BinTree.o ubiqx/ubi_Cache.o ubiqx/ubi_SplayTree.o \
             ubiqx/ubi_dLinkList.o ubiqx/ubi_sLinkList.o ubiqx/debugparse.o
 
 PARAM_OBJ = param/loadparm.o param/params.o 
 
-LIBSMB_OBJ = libsmb/clientgen.o libsmb/namequery.o libsmb/nmblib.o \
+LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
+            libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
+            libsmb/clireadwrite.o libsmb/clilist.o libsmb/cliprint.o \
+            libsmb/clitrans.o \
+            libsmb/namequery.o libsmb/nmblib.o \
              libsmb/nterr.o libsmb/smbdes.o libsmb/smbencrypt.o \
              libsmb/smberr.o libsmb/credentials.o libsmb/pwd_cache.o \
             libsmb/passchange.o libsmb/unexpected.o
@@ -144,7 +152,7 @@ RPC_CLIENT_OBJ = \
                rpc_client/cli_samr.o 
 
 
-LOCKING_OBJ = locking/locking.o locking/brlock.o
+LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o
 
 PASSDB_OBJ = passdb/passdb.o passdb/smbpassfile.o passdb/smbpass.o \
              passdb/pass_check.o passdb/ldap.o passdb/nispass.o passdb/smbpasschange.o
@@ -153,23 +161,26 @@ PROFILE_OBJ = profile/profile.o
 
 SMBD_OBJ1 = smbd/server.o smbd/files.o smbd/chgpasswd.o smbd/connection.o \
             smbd/dfree.o smbd/dir.o smbd/password.o smbd/conn.o smbd/fileio.o \
-            smbd/ipc.o smbd/mangle.o smbd/negprot.o \
-            smbd/message.o smbd/nttrans.o smbd/pipes.o smbd/predict.o \
-            smbd/$(QUOTAOBJS) smbd/reply.o smbd/trans2.o smbd/uid.o \
+            smbd/ipc.o smbd/lanman.o smbd/mangle.o smbd/negprot.o \
+            smbd/message.o smbd/nttrans.o smbd/pipes.o \
+            smbd/reply.o smbd/trans2.o smbd/uid.o \
            smbd/dosmode.o smbd/filename.o smbd/open.o smbd/close.o smbd/blocking.o \
-           smbd/vfs.o smbd/vfs-wrap.o \
+           smbd/vfs.o smbd/vfs-wrap.o smbd/statcache.o \
             lib/msrpc-client.o lib/msrpc_use.o \
             rpc_parse/parse_creds.o \
-           smbd/process.o smbd/oplock.o smbd/service.o smbd/error.o printing/nt_printing.o
+           smbd/process.o smbd/oplock.o smbd/service.o smbd/error.o \
+           printing/printfsp.o
+
+PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_cups.o printing/load.o
 
-PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/printing.o \
-               printing/print_cups.o
+PRINTBACKEND_OBJ = printing/printing.o printing/lpq_parse.o printing/nt_printing.o
 
 MSDFS_OBJ = msdfs/msdfs.o msdfs/msdfs_tdb.o msdfs/parse_dfs_map.o
 
 SMBD_OBJ = $(SMBD_OBJ1) $(MSDFS_OBJ) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
            $(RPC_SERVER_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
-           $(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ)
+           $(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) $(LIB_OBJ) \
+          $(PRINTBACKEND_OBJ) $(QUOTAOBJS)
 
 
 NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
@@ -189,9 +200,9 @@ NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) \
            $(LIB_OBJ)
 
 SWAT_OBJ = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
-           web/swat.o $(LIBSMB_OBJ) $(LOCKING_OBJ) \
+           web/swat.o $(PRINTING_OBJ) $(LIBSMB_OBJ) $(LOCKING_OBJ) \
            $(PARAM_OBJ) $(PASSDB_OBJ) $(RPC_CLIENT_OBJ) $(RPC_PARSE_OBJ) \
-           $(UBIQX_OBJ) $(LIB_OBJ) $(PRINTING_OBJ)
+           $(UBIQX_OBJ) $(LIB_OBJ) 
 
 SMBRUN_OBJ = utils/smbrun.o lib/util_sec.o
 
@@ -256,7 +267,10 @@ NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(UBIQX_OBJ) \
 SMBTORTURE_OBJ = utils/torture.o utils/nbio.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
                  $(UBIQX_OBJ) $(LIB_OBJ)
 
-MASKTEST_OBJ = utils/masktest.o smbd/mangle.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
+MASKTEST_OBJ = utils/masktest.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
+                 $(UBIQX_OBJ) $(LIB_OBJ)
+
+LOCKTEST_OBJ = utils/locktest.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
                  $(UBIQX_OBJ) $(LIB_OBJ)
 
 RPCTORTURE_OBJ = utils/rpctorture.o \
@@ -295,6 +309,8 @@ smbtorture : CHECK bin/smbtorture
 
 masktest : CHECK bin/masktest
 
+locktest : CHECK bin/locktest
+
 rpctorture : CHECK bin/rpctorture
 
 debug2html : CHECK bin/debug2html
@@ -465,6 +481,10 @@ bin/masktest: $(MASKTEST_OBJ) bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(LIBS)
 
+bin/locktest: $(LOCKTEST_OBJ) bin/.dummy
+       @echo Linking $@
+       @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(LIBS)
+
 bin/rpctorture: $(RPCTORTURE_OBJ) bin/.dummy
        @echo Linking $@
        @$(CC) $(FLAGS) -o $@ $(RPCTORTURE_OBJ) $(LDFLAGS) $(LIBS)
@@ -584,14 +604,14 @@ AUTOHEADER=@AUTOHEADER@
 
 # when configure.in is updated, reconfigure
 $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
-       cd $(srcdir) && $(AUTOCONF)
+       @echo "WARNING: you need to rerun configure"
 
 config.status: $(srcdir)/configure
-       $(SHELL) ./config.status --recheck
+       @echo "WARNING: you need to run ./config.status --recheck"
 
 Makefile: $(srcdir)/Makefile.in config.status \
          include/stamp-h # just to ensure that config.h is up-to-date
-       CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+       @echo "WARNING: you need to run ./config.status"
 
 # note that nothing depends on config.h, so will probably be rebuilt
 # only when explicitly requested, unless dependency tracking is enabled
Kai's WIP code