Merge branch 'master' of ssh://git.samba.org/data/git/samba

[amitay/samba.git] / source4 / lib / registry / config.mk

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index c0ad613c52096aebad0dfd534869d4a466613fbc..a566042cf22ad8200ff792fbad5279ce059d305f 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -5,12 +5,11 @@ TDR_REGF_OBJ_FILES = $(libregistrysrcdir)/tdr_regf.o
 
 # Special support for external builddirs
 $(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
-$(srcdir)/$(libregistrysrcdir)/regf.c: $(libregistrysrcdir)/tdr_regf.c
 $(libregistrysrcdir)/tdr_regf.h: $(libregistrysrcdir)/tdr_regf.c
-$(libregistrysrcdir)/tdr_regf.c: $(srcdir)/$(libregistrysrcdir)/regf.idl
-       @CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
-               --header --outputdir=lib/registry \
-               --tdr-parser -- $(srcdir)/$(libregistrysrcdir)/regf.idl
+$(libregistrysrcdir)/tdr_regf.c: $(libregistrysrcdir)/regf.idl
+       @CPP="$(CPP)" $(PERL) $(pidldir)/pidl $(PIDL_ARGS) \
+               --header --outputdir=$(libregistrysrcdir) \
+               --tdr-parser -- $(libregistrysrcdir)/regf.idl
 
 clean::
        @-rm -f $(libregistrysrcdir)/regf.h $(libregistrysrcdir)/tdr_regf*
@@ -98,14 +97,14 @@ regtree_OBJ_FILES = $(libregistrysrcdir)/tools/regtree.o
 MANPAGES += $(libregistrysrcdir)/man/regtree.1
 
 [SUBSYSTEM::torture_registry]
-PRIVATE_DEPENDENCIES = registry
+PRIVATE_DEPENDENCIES = torture registry
 
 torture_registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/tests/, generic.o hive.o diff.o registry.o)
 
 $(eval $(call proto_header_template,$(libregistrysrcdir)/tests/proto.h,$(torture_registry_OBJ_FILES:.o=.c)))
 
-[PYTHON::swig_registry]
-PUBLIC_DEPENDENCIES = registry
-SWIG_FILE = registry.i
+[PYTHON::py_registry]
+LIBRARY_REALNAME = samba/registry.$(SHLIBEXT)
+PUBLIC_DEPENDENCIES = registry PYTALLOC pycredentials param
 
-swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o
+py_registry_OBJ_FILES = $(libregistrysrcdir)/pyregistry.o