s4:samldb LDB module - make the "userAccountControl" and "groupType" modify handlers...

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

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index bb939be0c5f7e2e3e72d28f5cd5f3a0772beaa5e..9ff917f75a3a6fdbc83ff9d308ae7203cc73cffa 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*
@@ -31,7 +30,8 @@ registry_SOVERSION = 0
 
 registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/, interface.o util.o samba.o \
                                        patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
-                                       hive.o local.o ldb.o dir.o rpc.o)
+                                       hive.o local.o ldb.o dir.o rpc.o) \
+                                       ../libcli/registry/util_reg.o
 
 PUBLIC_HEADERS += $(libregistrysrcdir)/registry.h
 
@@ -98,16 +98,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
-
-swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o
+[PYTHON::py_registry]
+LIBRARY_REALNAME = samba/registry.$(SHLIBEXT)
+PUBLIC_DEPENDENCIES = registry PYTALLOC pycredentials pyparam_util
 
-$(eval $(call python_py_module_template,registry.py,lib/registry/registry.py))
+py_registry_OBJ_FILES = $(libregistrysrcdir)/pyregistry.o