fix linking and remove SConscript files

7 files changed, 5 insertions, 39 deletions

diff --git a/lua/Makefile b/lua/Makefile
index 43bac78..a68012a 100644
--- a/lua/Makefile
+++ b/lua/Makefile
@@ -1,7 +1,8 @@
 CFLAGS += -fPIC -Wall -W
+CFLAGS += -I./lua-5.1/src
 export CFLAGS
 
 source_list := $(shell find ./lua-5.1/src -name "*.c" -not -name "lua.c" -not -name "luac.c" -not -name "print.c")
 
-obj-default = $(source_list:.c=.o)
+obj-default = $(source_list:.c=.o) lua_bindings.o
 
diff --git a/lua/SConscript b/lua/SConscript
deleted file mode 100644
index 404a10e..0000000
--- a/lua/SConscript
+++ /dev/null
@@ -1,22 +0,0 @@
-import glob
-
-Import('env')
-
-lualib_env = env.Copy()
-
-lualib_src = glob.glob("lua-5.1/src/*.c")
-
-# remove unwanted compiler and interpreter files
-lualib_src.remove("lua-5.1/src/lua.c")
-lualib_src.remove("lua-5.1/src/luac.c")
-lualib_src.remove("lua-5.1/src/print.c")
-
-lualib_env.StaticLibrary("liblua", lualib_src)
-
-lua_env = env.Copy()
-
-lua_env.Append(LIBS = "lua")
-lua_env.Append(LIBPATH = ".")
-lua_env.Append(CCFLAGS = " -I./lua/lua-5.1/src")
-lua_env.StaticLibrary("lua_bindings", ["lua_bindings.c"])
-
diff --git a/preload/Makefile b/preload/Makefile
index d46ff8a..1e6d645 100644
--- a/preload/Makefile
+++ b/preload/Makefile
@@ -7,5 +7,6 @@ obj-default = libsb2.o libsb_env.o sb_alien.o
 extra_targets = libsb2.so
 
 libsb2.so: built-in.o
-	$(LD) -shared -Bdynamic -o libsb2.so built-in.o ../lua/built-in.o $(LIBS)
+#	$(LD) --export-dynamic -Bsymbolic -shared -o libsb2.so built-in.o ../lua/built-in.o $(LIBS)
+	$(CC) -shared -o libsb2.so built-in.o ../lua/built-in.o $(LIBS)
 
diff --git a/preload/SConscript b/preload/SConscript
deleted file mode 100644
index 77f5d90..0000000
--- a/preload/SConscript
+++ /dev/null
@@ -1,9 +0,0 @@
-Import("env")
-
-preload_env = env.Copy()
-
-preload_env.Append(CCFLAGS = ["-Wall", "-W"])
-preload_env.Append(LIBPATH = "../lua")
-preload_env.Append(LIBS = ["m", "dl", "lua_bindings", "lua"])
-preload_env.SharedLibrary("sb2", ["libsb2.c", "libsb_env.c", "sb_alien.c"])
-
diff --git a/preload/libsb2.c b/preload/libsb2.c
index 0856354..2f06af0 100644
--- a/preload/libsb2.c
+++ b/preload/libsb2.c
@@ -645,7 +645,6 @@ void fakechroot_init (void)
 #endif
     nextsym(utime, "utime");
     nextsym(utimes, "utimes");
-
 	scratchbox_init();
 }
 
diff --git a/preload/sb_alien.c b/preload/sb_alien.c
index 5919600..6fc4360 100644
--- a/preload/sb_alien.c
+++ b/preload/sb_alien.c
@@ -6,7 +6,7 @@
 
 
 #define LD_LIB_PATH	"/lib/:/lib/tls"
-#define LD_SO		"/lib/ld-2.3.6.so"
+#define LD_SO		"/lib/ld-2.4.so"
 extern int     (*next_execve) (const char *filename, char *const argv [], char *const envp[]);
 
 
diff --git a/utils/SConscript b/utils/SConscript
deleted file mode 100644
index cc10bc2..0000000
--- a/utils/SConscript
+++ /dev/null
@@ -1,4 +0,0 @@
-Import('env')
-
-env.Program('chroot-uid', ['chroot-uid.c'])
-