restructure

Makefile

@@ -7,20 +7,20 @@ lua := lua
 cc := gcc
 
 dst_dir = dst
-src_lua_dir = src
+src_main_dir = src/main
-src_c_dir = lib
+src_entry_dir = src/entry
 
 # Uncomment to get debugging symbols
 # flags := -g
 
-lua_sources += $(wildcard $(src_lua_dir)/*.lua)
+main_sources += $(wildcard $(src_main_dir)/*.lua)
-lua_sources += $(wildcard $(src_lua_dir)/cli/*.lua)
+main_sources += $(wildcard $(src_main_dir)/cli/*.lua)
-lua_sources += $(wildcard $(src_lua_dir)/formats/*.lua)
+main_sources += $(wildcard $(src_main_dir)/formats/*.lua)
-lua_sources += $(wildcard $(src_lua_dir)/util/*.lua)
+main_sources += $(wildcard $(src_main_dir)/util/*.lua)
 
-c_sources = $(wildcard $(src_c_dir)/*.c)
+c_sources = $(wildcard $(src_entry_dir)/*.c)
 
-build_entry = $(src_c_dir)/build.lua
+build_entry = $(src_entry_dir)/build.lua
 
 target = $(dst_dir)/slimpack
 bytecode_target = $(dst_dir)/bytecode.h
@@ -32,7 +32,7 @@ build: $(target)
 $(dst_dir):
 	mkdir -p $@
 
-$(bytecode_target): $(lua_sources) $(dst_dir)
+$(bytecode_target): $(main_sources) $(dst_dir) $(build_entry)
-	$(lua) lib/build.lua src $@ $(lua_sources)
+	$(lua) $(build_entry) $(src_main_dir) $@ $(main_sources)
 $(target): $(c_sources) $(bytecode_target) $(dst_dir)
 	$(cc) $(flags) $(libraries) -include $(bytecode_target) $(c_sources) -o $@