summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/configure.in2
-rw-r--r--source4/lib/registry/config.mk3
-rw-r--r--source4/main.mk5
-rw-r--r--source4/scripting/swig/config.m4 (renamed from source4/scripting/config.m4)0
-rw-r--r--source4/scripting/swig/config.mk (renamed from source4/scripting/config.mk)14
5 files changed, 12 insertions, 12 deletions
diff --git a/source4/configure.in b/source4/configure.in
index a4df9daba5..84b40cb7bf 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -35,7 +35,7 @@ sinclude(auth/gensec/config.m4)
sinclude(libcli/config.m4)
sinclude(smbd/process_model.m4)
sinclude(lib/registry/config.m4)
-sinclude(scripting/config.m4)
+sinclude(scripting/swig/config.m4)
sinclude(gtk/config.m4)
sinclude(ntvfs/posix/config.m4)
sinclude(lib/socket_wrapper/config.m4)
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index fe80c62af4..5d535e4c58 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -21,6 +21,9 @@ lib/registry/tdr_regf.c: lib/registry/regf.idl
--header --outputdir=lib/registry \
--tdr-parser -- lib/registry/regf.idl
+clean::
+ @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
+
################################################
# Start MODULE registry_w95
[MODULE::registry_w95]
diff --git a/source4/main.mk b/source4/main.mk
index 73d29ab2c5..c8a07be6ce 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -28,7 +28,8 @@ include torture/config.mk
include librpc/config.mk
include client/config.mk
include libcli/config.mk
-include scripting/config.mk
+include scripting/ejs/config.mk
+include scripting/swig/config.mk
include kdc/config.mk
include passdb/config.mk
@@ -246,7 +247,6 @@ clean:: clean_pch
@echo Removing generated files
@-rm -f bin/*_init_module.c
@-rm -rf librpc/gen_*
- @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
@echo Removing proto headers
@-rm -f $(PROTO_HEADERS)
@@ -255,7 +255,6 @@ distclean: clean
-rm -f Makefile
-rm -f config.status
-rm -f config.log config.cache
- -rm -f samba4-deps.dot
-rm -f config.pm config.mk
-rm -f $(PC_FILES)
diff --git a/source4/scripting/config.m4 b/source4/scripting/swig/config.m4
index 02a563e167..02a563e167 100644
--- a/source4/scripting/config.m4
+++ b/source4/scripting/swig/config.m4
diff --git a/source4/scripting/config.mk b/source4/scripting/swig/config.mk
index b5d848ce2b..e0a265b679 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,10 +1,8 @@
-include ejs/config.mk
-
#######################
# Start LIBRARY swig_tdb
[LIBRARY::swig_tdb]
-LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
-OBJ_FILES = swig/tdb_wrap.o
+LIBRARY_REALNAME = _tdb.$(SHLIBEXT)
+OBJ_FILES = tdb_wrap.o
REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
# End LIBRARY swig_tdb
#######################
@@ -13,17 +11,17 @@ REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
# Start LIBRARY swig_ldb
[LIBRARY::swig_ldb]
REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
-LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
-OBJ_FILES = swig/ldb_wrap.o
+LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
+OBJ_FILES = ldb_wrap.o
# End LIBRARY swig_ldb
#######################
#######################
# Start LIBRARY swig_dcerpc
[LIBRARY::swig_dcerpc]
-LIBRARY_REALNAME = swig/_dcerpc.$(SHLIBEXT)
+LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
-OBJ_FILES = swig/dcerpc_wrap.o
+OBJ_FILES = dcerpc_wrap.o
# End LIBRARY swig_dcerpc
#######################