git.samba.org
/
metze
/
samba
/
wip.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s3:Makefile.in: use waf directly to build smbtorture4 and ndrdump4
[metze/samba/wip.git]
/
source3
/
Makefile.in
diff --git
a/source3/Makefile.in
b/source3/Makefile.in
index 16c2cca2e947b928cabe98436a635c7ff659dfbd..6d5a3faf9d5df7bc72638bb75b2331c5aacedc2d 100644
(file)
--- a/
source3/Makefile.in
+++ b/
source3/Makefile.in
@@
-367,17
+367,16
@@
LIBCLI_WKSSVC_OBJ = librpc/gen_ndr/ndr_wkssvc_c.o
LIBCLI_SRVSVC_OBJ = librpc/gen_ndr/ndr_srvsvc_c.o
LIBCLI_SRVSVC_OBJ = librpc/gen_ndr/ndr_srvsvc_c.o
-LIBCLI_LSA_OBJ = librpc/gen_ndr/cli_lsa.o \
- librpc/gen_ndr/ndr_lsa_c.o \
+LIBCLI_LSA_OBJ = librpc/gen_ndr/ndr_lsa_c.o \
rpc_client/cli_lsarpc.o \
rpc_client/init_lsa.o
rpc_client/cli_lsarpc.o \
rpc_client/init_lsa.o
-LIBCLI_SAMR_OBJ = librpc/gen_ndr/cli_samr.o \
- librpc/gen_ndr/ndr_samr_c.o \
+LIBCLI_SAMR_OBJ = librpc/gen_ndr/ndr_samr_c.o \
rpc_client/cli_samr.o
LIBCLI_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon_c.o \
rpc_client/cli_samr.o
LIBCLI_NETLOGON_OBJ = librpc/gen_ndr/ndr_netlogon_c.o \
- rpc_client/cli_netlogon.o
+ rpc_client/cli_netlogon.o \
+ rpc_client/util_netlogon.o
LIBCLI_EPMAPPER_OBJ = librpc/gen_ndr/ndr_epmapper_c.o
LIBCLI_EPMAPPER_OBJ = librpc/gen_ndr/ndr_epmapper_c.o
@@
-658,6
+657,8
@@
REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
+DCE_RPC_EP_OBJ = librpc/rpc/dcerpc_ep.o
+
RPC_LSARPC_OBJ = rpc_server/srv_lsa_nt.o \
librpc/gen_ndr/srv_lsa.o
RPC_LSARPC_OBJ = rpc_server/srv_lsa_nt.o \
librpc/gen_ndr/srv_lsa.o
@@
-720,6
+721,8
@@
RPC_RPCECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
RPC_EPMAPPER_OBJ = rpc_server/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o
RPC_EPMAPPER_OBJ = rpc_server/srv_epmapper.o librpc/gen_ndr/srv_epmapper.o
+RPC_SERVER_REGISTER_OBJ = rpc_server/srv_rpc_register.o $(DCE_RPC_EP_OBJ)
+
RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \
$(RPC_DSSETUP_OBJ) $(RPC_WKSSVC_OBJ) $(RPC_SVCCTL_OBJ) \
$(RPC_NTSVCS_OBJ) $(RPC_NETLOGON_OBJ) $(RPC_NETDFS_OBJ) \
RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \
$(RPC_DSSETUP_OBJ) $(RPC_WKSSVC_OBJ) $(RPC_SVCCTL_OBJ) \
$(RPC_NTSVCS_OBJ) $(RPC_NETLOGON_OBJ) $(RPC_NETDFS_OBJ) \
@@
-732,6
+735,7
@@
RPC_SERVER_OBJ = $(RPC_LSARPC_OBJ) $(RPC_WINREG_OBJ) $(RPC_INITSHUTDOWN_OBJ) \
$(LIBCLI_LSA_OBJ) \
$(LIBCLI_SAMR_OBJ) \
$(LIBCLI_NETLOGON_OBJ) \
$(LIBCLI_LSA_OBJ) \
$(LIBCLI_SAMR_OBJ) \
$(LIBCLI_NETLOGON_OBJ) \
+ $(RPC_SERVER_REGISTER_OBJ) \
$(RPC_CLIENT_SCHANNEL_OBJ) \
rpc_client/init_netlogon.o \
rpc_client/init_samr.o
$(RPC_CLIENT_SCHANNEL_OBJ) \
rpc_client/init_netlogon.o \
rpc_client/init_samr.o
@@
-1118,6
+1122,7
@@
LIBNET_OBJ = libnet/libnet_join.o \
librpc/gen_ndr/ndr_libnet_join.o
LIBNET_DSSYNC_OBJ = libnet/libnet_dssync.o \
librpc/gen_ndr/ndr_libnet_join.o
LIBNET_DSSYNC_OBJ = libnet/libnet_dssync.o \
+ libnet/libnet_dssync_passdb.o \
libnet/libnet_dssync_keytab.o \
../libcli/drsuapi/repl_decrypt.o
libnet/libnet_dssync_keytab.o \
../libcli/drsuapi/repl_decrypt.o
@@
-3469,21
+3474,24
@@
libnetapi_examples: libnetapi
clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean
clean_libnetapi_examples:
$(MAKE) -C lib/netapi/examples clean
-../source4/configure: ../buildtools/scripts/configure.waf
- cd ../source4 && ./autogen.sh
+WAF_BINARY=../buildtools/bin/waf
+WAF=$(WAF_BINARY)
+WAF_BUILD=WAF_MAKE=1 $(WAF_BINARY)
+SAMBA4_BINARIES=smbtorture,ndrdump
-samba4-configure: ../source4/configure
- @CFLAGS='' $(MAKE) -C ../source4 reconfigure || ( cd ../source4 && \
- CFLAGS='' ./configure.developer --nonshared-binary=smbtorture --enable-auto-reconfigure )
+samba4-configure:
+ @(cd ../source4 && \
+ CFLAGS='' $(WAF) reconfigure || \
+ CFLAGS='' $(WAF) configure --enable-developer --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
.PHONY: samba4-configure
bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
.PHONY: samba4-configure
bin/smbtorture4: $(BINARY_PREREQS) samba4-configure
- cd ../source4 && $(
MAKE) bin/
smbtorture
+ cd ../source4 && $(
WAF_BUILD) --targets=
smbtorture
cp ../source4/bin/smbtorture bin/smbtorture4
bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
cp ../source4/bin/smbtorture bin/smbtorture4
bin/ndrdump4: $(BINARY_PREREQS) samba4-configure
- cd ../source4 && $(
MAKE) bin/
ndrdump
+ cd ../source4 && $(
WAF_BUILD) --targets=
ndrdump
cp ../source4/bin/ndrdump bin/ndrdump4
.PHONY: bin/smbtorture4
cp ../source4/bin/ndrdump bin/ndrdump4
.PHONY: bin/smbtorture4