Two useful "regshell" improvements

[ira/wip.git] / source4 / libnet / config.mk

diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index f7ff07a7bc26cdd2adbb90180ac9947346579ffb..fac8af18b777280b2bc9afdf16f6d76751c8d88c 100644 (file)
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -1,23 +1,18 @@
 [SUBSYSTEM::LIBSAMBA-NET]
-PRIVATE_PROTO_HEADER = libnet_proto.h
-PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD
+PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION
 
-LIBSAMBA-NET_OBJ_FILES = $(addprefix libnet/, \
+LIBSAMBA-NET_OBJ_FILES = $(addprefix $(libnetsrcdir)/, \
        libnet.o libnet_passwd.o libnet_time.o libnet_rpc.o \
        libnet_join.o libnet_site.o libnet_become_dc.o libnet_unbecome_dc.o \
        libnet_vampire.o libnet_samdump.o libnet_samdump_keytab.o \
        libnet_samsync_ldb.o libnet_user.o libnet_group.o libnet_share.o \
        libnet_lookup.o libnet_domain.o userinfo.o groupinfo.o userman.o \
-       groupman.o prereq_domain.o)
+       groupman.o prereq_domain.o libnet_samsync.o)
 
-PUBLIC_HEADERS += $(addprefix libnet/, libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
-                                libnet_rpc.h libnet_share.h libnet_time.h \
-                                libnet_user.h libnet_site.h libnet_vampire.h \
-                                userinfo.h userman.h)
+$(eval $(call proto_header_template,$(libnetsrcdir)/libnet_proto.h,$(LIBSAMBA-NET_OBJ_FILES:.o=.c)))
 
-
-[PYTHON::swig_net]
+[PYTHON::python_net]
+LIBRARY_REALNAME = samba/net.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET
-SWIG_FILE = net.i
 
-swig_net_OBJ_FILES = libnet/net_wrap.o
+python_net_OBJ_FILES = $(libnetsrcdir)/py_net.o