fix script integration

2011-05-04 13:18:37 +00:00 · 2011-05-04 13:18:37 +00:00 · 18dda7629b
parent 7531409809
commit 18dda7629b
3 changed files with 5 additions and 5 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -47,11 +47,11 @@ lsyncd_LDADD += luac.o

 luac.o: luac.c

+luac.c: luac.out bin2carray.lua
+	lua ./bin2carray.lua luac.out luac luac.c
+
 luac.out: lsyncd.lua
 	luac $<

-luac.c: lsyncd.lua bin2carray.lua
-	lua ./bin2carray.lua lsyncd.lua luac luac.c
-
 endif

--- a/bin2carray.lua
+++ b/bin2carray.lua
@ -26,7 +26,7 @@ end

 fout:write("/* created by "..arg[0].." from file "..arg[1].." */\n")
 fout:write("#include <stddef.h>\n")
-fout:write("const unsigned char "..arg[2].."_out[] = {\n")
+fout:write("const char "..arg[2].."_out[] = {\n")
 while true do
 	local block = fin:read(16)
 	if block == nil then
--- a/lsyncd.c
+++ b/lsyncd.c
@ -45,7 +45,7 @@
 * The Lua part of lsyncd if compiled into the binary.
 */
 #ifndef LSYNCD_DEFAULT_RUNNER_FILE
-	extern unsigned char * luac_out;
+	extern const char luac_out[];
 	extern size_t luac_size;
 #endif