From a15b6f1606e1c761c2c4037b734137e97f00489f Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 20:00:04 +0200
Subject: Fix unresolved symbols. (This used to be commit
 8573e828d1b68c47b3c1754e9be230b2e78d9d52)

---
 source4/scripting/ejs/config.mk    | 2 +-
 source4/scripting/python/config.mk | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'source4/scripting')

diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index a3ed5239bf..cadd71673c 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -58,7 +58,7 @@ smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
-PRIVATE_DEPENDENCIES = service_auth
+PRIVATE_DEPENDENCIES = auth
 
 smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
 
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cb03bfaeea..2f010644b1 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,23 +1,25 @@
 [BINARY::smbpython]
 PRIVATE_DEPENDENCIES = LIBPYTHON
 
-smbpython_OBJ_FILES = smbpython.o
+smbpython_OBJ_FILES = scripting/python/smbpython.o
 
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
 
-LIBPYTHON_OBJ_FILES = modules.o pytalloc.o
+LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o pytalloc.o)
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
 
-python_uuid_OBJ_FILES = uuidmodule.o
+python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
 
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
+python_misc_OBJ_FILES = scripting/python/misc_wrap.o
+
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
 pythonmods:: $(PYTHON_PYS) $(PYTHON_MODS)
-- 
cgit