diff options
Diffstat (limited to 'source4/Makefile.in')
| -rw-r--r-- | source4/Makefile.in | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index 407dedcfbd..b362b0c18d 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -95,6 +95,7 @@ MODULES = $(CHARSET_MODULES) $(DCERPC_MODULES) $(NTVFS_MODULES) CHARSET_OBJS = @CHARSET_OBJS@ LIBBASIC_OBJS = @LIBBASIC_OBJS@ +LIBBASIC_LIBS = @LIBBASIC_LIBS@ $(LIBS) LIBCLI_RAW_OBJS = @LIBCLI_RAW_OBJS@ LIBCLI_UTILS_OBJS = @LIBCLI_UTILS_OBJS@ @@ -107,14 +108,16 @@ LIBRPC_RAW_OBJS = @LIBRPC_RAW_OBJS@ LIBRPC_OBJS = @LIBRPC_OBJS@ LIBSMB_OBJS = @LIBSMB_OBJS@ +LIBSMB_LIBS = @LIBSMB_LIBS@ LIBPOPT_OBJS = @LIBPOPT_OBJS@ LIBPOPT_LIBS = @LIBPOPT_LIBS@ -LIBCMDLINE_OBJS = @LIBCMDLINE_OBJS@ -LIBCMDLINE_LIBS = @LIBCMDLINE_LIBS@ +LIBCMDLINE_OBJS = @LIBCMDLINE_OBJS@ $(LIBPOPT_OBJS) +LIBCMDLINE_LIBS = @LIBCMDLINE_LIBS@ $(LIBPOPT_LIBS) CONFIG_OBJS = @CONFIG_OBJS@ +CONFIG_LIBS = @CONFIG_LIBS@ PROCESS_MODEL_OBJS = @PROCESS_MODEL_OBJS@ PROCESS_MODEL_LIBS = @PROCESS_MODEL_LIBS@ @@ -139,52 +142,49 @@ TORTURE_RAW_OBJS = @TORTURE_RAW_OBJS@ TORTURE_RPC_OBJS = @TORTURE_RPC_OBJS@ TORTURE_OBJS = @TORTURE_OBJS@ +TORTURE_LIBS = @TORTURE_LIBS@ -SMBD_OBJ_MAIN = smbd/server.o +CLIENT_OBJS = client/client.o client/clitar.o libcli/raw/clirewrite.o +CLIENT_LIBS = -SMBD_OBJ_SRV = smbd/process.o \ +SERVER_OBJS = smbd/server.o smbd/process.o \ lib/server_mutex.o \ smbd/build_options.o \ - smbd/rewrite.o \ - $(DCERPC_OBJS) $(SMB_OBJS) $(AUTH_OBJS) $(PASSDB_OBJS) $(NTVFS_OBJS) @SMBD_EXTRA_OBJS@ + smbd/rewrite.o +SERVER_LIBS = +SMBD_OBJS = $(SERVER_OBJS) $(PROCESS_MODEL_OBJS) \ + $(DCERPC_OBJS) $(SMB_OBJS) $(AUTH_OBJS) $(PASSDB_OBJS) $(NTVFS_OBJS) \ + $(LIBBASIC_OBJS) $(CONFIG_OBJS) $(LIBCMDLINE_OBJS) $(LIBSMB_OBJS) +SMBD_LIBS = $(SERVER_LIBS) $(PROCESS_MODEL_LIBS) \ + $(DCERPC_LIBS) $(SMB_LIBS) $(AUTH_LIBS) $(PASSDB_LIBS) $(NTVFS_LIBS) \ + $(LIBBASIC_LIBS) $(CONFIG_LIBS) $(LIBCMDLINE_LIBS) $(LIBSMB_LIBS) - -SMBD_OBJ_BASE = $(PROCESS_MODEL_OBJS) $(SMBD_OBJ_SRV) \ - $(CONFIG_OBJS) \ - $(LIBBASIC_OBJS) $(LIBCMDLINE_OBJS) $(LIBSMB_OBJS) - -SMBD_OBJS = $(SMBD_OBJ_MAIN) $(SMBD_OBJ_BASE) $(LIBPOPT_OBJS) -SMBD_LIBS = $(LIBS) $(LIBCMDLINE_LIBS) $(SMB_LIBS) $(PROCESS_MODEL_LIBS) $(DCERPC_LIBS) $(AUTH_LIBS) $(PASSDB_LIBS) $(NTVFS_LIBS) $(LIBPOPT_LIBS) - -CLIENT_OBJ1 = client/client.o client/clitar.o libcli/raw/clirewrite.o - -CLIENT_OBJ = $(CLIENT_OBJ1) $(CONFIG_OBJS) $(LIBSMB_OBJS) \ - $(LIBBASIC_OBJS) \ - $(LIBCMDLINE_OBJS) $(LIBPOPT_OBJS) +SMBCLIENT_OBJS = $(CLIENT_OBJS) $(LIBSMB_OBJS) $(CONFIG_OBJS) $(LIBBASIC_OBJS) $(LIBCMDLINE_OBJS) +SMBCLIENT_LIBS = $(CLIENT_LIBS) $(LIBSMB_LIBS) $(CONFIG_LIBS) $(LIBBASIC_LIBS) $(LIBCMDLINE_LIBS) SMBTORTURE_OBJS = $(TORTURE_OBJS) $(CONFIG_OBJS) $(LIBSMB_OBJS) $(LIBBASIC_OBJS) -SMBTORTURE_LIBS = $(LIBS) +SMBTORTURE_LIBS = $(TORTURE_LIBS) $(CONFIG_LIBS) $(LIBSMB_LIBS) $(LIBBASIC_LIBS) -GENTEST_OBJ = torture/gentest.o torture/torture_util.o $(LIBSMB_OBJS) $(CONFIG_OBJS) \ - $(LIBBASIC_OBJS) libcli/raw/clirewrite.o +GENTEST_OBJS = torture/gentest.o torture/torture_util.o libcli/raw/clirewrite.o \ + $(LIBSMB_OBJS) $(CONFIG_OBJS) $(LIBBASIC_OBJS) +GENTEST_LIBS = $(LIBSMB_LIBS) $(CONFIG_LIBS) $(LIBBASIC_LIBS) -MASKTEST_OBJ = torture/masktest.o $(LIBSMB_OBJS) $(CONFIG_OBJS) \ - $(LIBBASIC_OBJS) libcli/raw/clirewrite.o +MASKTEST_OBJS = torture/masktest.o libcli/raw/clirewrite.o \ + $(LIBSMB_OBJS) $(CONFIG_OBJS) $(LIBBASIC_OBJS) +MASKTEST_LIBS = $(LIBSMB_LIBS) $(CONFIG_LIBS) $(LIBBASIC_LIBS) -LOCKTEST_OBJ = torture/locktest.o $(LIBSMB_OBJS) $(CONFIG_OBJS) \ - $(LIBBASIC_OBJS) libcli/raw/clirewrite.o +LOCKTEST_OBJS = torture/locktest.o libcli/raw/clirewrite.o \ + $(LIBSMB_OBJS) $(CONFIG_OBJS) $(LIBBASIC_OBJS) +LOCKTEST_LIBS = $(LIBSMB_LIBS) $(CONFIG_LIBS) $(LIBBASIC_LIBS) -NDRDUMP_OBJ = utils/ndrdump.o utils/rewrite.o \ +NDRDUMP_OBJS = utils/ndrdump.o utils/rewrite.o \ $(LIBSMB_OBJS) $(CONFIG_OBJS) $(LIBBASIC_OBJS) +NDRDUMP_LIBS = $(LIBSMB_LIBS) $(CONFIG_LIBS) $(LIBBASIC_LIBS) -PROTO_OBJ = $(SMBD_OBJ_SRV) \ - $(SMBD_OBJ_MAIN) $(PROCESS_MODEL_OBJS) \ - $(LIBSMB_OBJS) \ - $(TORTURE_OBJS) \ - $(CONFIG_OBJS) \ - $(LIBCMDLINE_OBJS) $(CLIENT_OBJ1) \ - $(LIBBASIC_OBJS) +PROTO_OBJ = $(SERVER_OBJS) $(PROCESS_MODEL_OBJS) $(CLIENT_OBJS) $(TORTURE_OBJS) \ + $(DCERPC_OBJS) $(SMB_OBJS) $(AUTH_OBJS) $(PASSDB_OBJS) $(NTVFS_OBJS) \ + $(LIBBASIC_OBJS) $(CONFIG_OBJS) $(LIBCMDLINE_OBJS) $(LIBSMB_OBJS) ###################################################################### # now the rules... @@ -303,29 +303,29 @@ bin/smbd@EXEEXT@: $(SMBD_OBJS) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBD_OBJS) $(LDFLAGS) $(DYNEXP) $(SMBD_LIBS) -bin/smbclient@EXEEXT@: $(CLIENT_OBJ) bin/.dummy +bin/smbclient@EXEEXT@: $(SMBCLIENT_OBJS) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS) $(LIBCMDLINE_LIBS) + @$(CC) $(FLAGS) -o $@ $(SMBCLIENT_OBJS) $(LDFLAGS) $(SMBCLIENT_LIBS) bin/smbtorture@EXEEXT@: $(SMBTORTURE_OBJS) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJS) $(LDFLAGS) $(SMBTORTURE_LIBS) -bin/ndrdump@EXEEXT@: $(NDRDUMP_OBJ) bin/.dummy +bin/ndrdump@EXEEXT@: $(NDRDUMP_OBJS) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJS) $(LDFLAGS) $(NDRDUMP_LIBS) -bin/gentest@EXEEXT@: $(GENTEST_OBJ) bin/.dummy +bin/gentest@EXEEXT@: $(GENTEST_OBJS) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(GENTEST_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(GENTEST_OBJS) $(LDFLAGS) $(GENTEST_LIBS) -bin/masktest@EXEEXT@: $(MASKTEST_OBJ) bin/.dummy +bin/masktest@EXEEXT@: $(MASKTEST_OBJS) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJS) $(LDFLAGS) $(MASKTEST_LIBS) -bin/locktest@EXEEXT@: $(LOCKTEST_OBJ) bin/.dummy +bin/locktest@EXEEXT@: $(LOCKTEST_OBJS) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJS) $(LDFLAGS) $(LOCKTEST_LIBS) install: installbin installtorture installdat |