r7062: Merge scripting/swig/config.mk with scripting/config.mk

(This used to be commit e14c00c4c1cc51dac9452c1e950445907d883e46)

diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 593064c75f3ce8ace76b0cdef87f7345d578e6d7..758346b4217191e2ae904cbded37f1238eb261da 100644 (file)
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -63,7 +63,6 @@ sub smb_build_main($)
                "libcli/security/config.mk",
                "lib/com/config.mk",
                "scripting/config.mk",
                "libcli/security/config.mk",
                "lib/com/config.mk",
                "scripting/config.mk",

-               "scripting/swig/config.mk",

        );
 
        $| = 1;
        );
 
        $| = 1;

diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 31f7e6df9db1d93fae22c7617dff659b5a6a39c7..0ea102deeed36e158c41dce1154c6aedc3edb04f 100644 (file)
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -6,3 +6,17 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC
 # End BINARY SMBSCRIPT
 #######################
 REQUIRED_SUBSYSTEMS = EJS LIBBASIC
 # End BINARY SMBSCRIPT
 #######################

+
+#######################
+# Start LIBRARY swig_tdb
+[LIBRARY::swig_tdb]
+REQUIRED_SUBSYSTEMS = LIBTDB
+# End LIBRARY swig_tdb
+#######################
+
+#######################
+# Start LIBRARY swig_dcerpc
+[LIBRARY::swig_dcerpc]
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+# End LIBRARY swig_dcerpc
+#######################

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
deleted file mode 100644 (file)
index 38144fb..0000000
--- a/source4/scripting/swig/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[LIBRARY::swig_tdb]
-REQUIRED_SUBSYSTEMS = LIBTDB
-
-[LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA