Two useful "regshell" improvements

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

diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 243fc1813a0da5206363fc93c28cc421ec134afb..fac8af18b777280b2bc9afdf16f6d76751c8d88c 100644 (file)
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -1,8 +1,7 @@
 [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 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 \
@@ -10,7 +9,10 @@ LIBSAMBA-NET_OBJ_FILES = $(addprefix libnet/, \
        libnet_lookup.o libnet_domain.o userinfo.o groupinfo.o userman.o \
        groupman.o prereq_domain.o libnet_samsync.o)
 
+$(eval $(call proto_header_template,$(libnetsrcdir)/libnet_proto.h,$(LIBSAMBA-NET_OBJ_FILES:.o=.c)))
+
 [PYTHON::python_net]
+LIBRARY_REALNAME = samba/net.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET
 
-python_net_OBJ_FILES = libnet/py_net.o
+python_net_OBJ_FILES = $(libnetsrcdir)/py_net.o