From: John L. <jr...@us...> - 2008-01-15 18:48:08
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26453/wxLua/apps Modified Files: Makefile.in Log Message: Updated bakefiles to separate LUA_DIR to LUA_INCLUDE_DIR and LUA_LIB_DIR so a system Lua's include path can be specified exactly. Used bakefile-0.2.3 Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** Makefile.in 14 Jan 2008 23:30:21 -0000 1.67 --- Makefile.in 15 Jan 2008 18:37:26 -0000 1.68 *************** *** 39,43 **** WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_PORT = @WX_PORT@ ! LUA_DIR = @LUA_DIR@ WXLUA_LIBS = @WXLUA_LIBS@ RPATH_FLAGS = @RPATH_FLAGS@ --- 39,44 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_PORT = @WX_PORT@ ! LUA_INCLUDE_DIR = @LUA_INCLUDE_DIR@ ! LUA_LIB_DIR = @LUA_LIB_DIR@ WXLUA_LIBS = @WXLUA_LIBS@ RPATH_FLAGS = @RPATH_FLAGS@ *************** *** 49,64 **** DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ ! $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ app_lua_lua.o APP_LUAC_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/lua/include $(WX_CFLAGS) \ ! $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ app_luac_luac.o \ app_luac_print.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_lconsole.o \ --- 50,65 ---- DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CFLAGS) $(LUA_PLATFORM_SPECIFIC_CFLAGS) \ ! $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ app_lua_lua.o APP_LUAC_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CFLAGS) $(LUA_PLATFORM_SPECIFIC_CFLAGS) \ ! $(CPPFLAGS) $(CFLAGS) APP_LUAC_OBJECTS = \ app_luac_luac.o \ app_luac_print.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_lconsole.o \ *************** *** 66,70 **** $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ --- 67,71 ---- $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = \ app_wxluaedit_wxledit.o \ *************** *** 72,76 **** $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 73,77 ---- $(__app_wxluaedit___win32rc) APP_WXLUACAN_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) -I$(top_srcdir)/modules/wxbind/setup $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 82,86 **** $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ --- 83,87 ---- $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(LUA_INCLUDE_DIR) $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ app_wxluafreeze_wxluafreeze.o \ *************** *** 112,116 **** @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxlua$(EXEEXT) COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ ../bin/wxlua$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxlua___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd) --- 113,117 ---- @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxlua$(EXEEXT) COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -o \ ../bin/wxlua$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxlua___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxlua___mac_rezcmd) *************** *** 134,138 **** @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluaedit$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL \ ! -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ ../bin/wxluaedit$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd) --- 135,139 ---- @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluaedit$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL \ ! -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -o \ ../bin/wxluaedit$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluaedit___mac_rezcmd) *************** *** 155,159 **** @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxluacan$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -i \ $(top_srcdir)/modules/wxbind/setup -o ../bin/wxluacan$(EXEEXT) \ $(top_srcdir)/art/wxlua.r --- 156,160 ---- @COND_PLATFORM_MAC_1@ $(SETFILE) -a C ../bin/wxluacan$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluacan___mac_rezcmd = $(REZ) -d __DARWIN__ -t APPL -i \ ! $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -i \ $(top_srcdir)/modules/wxbind/setup -o ../bin/wxluacan$(EXEEXT) \ $(top_srcdir)/art/wxlua.r *************** *** 177,181 **** @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluafreeze$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd = $(REZ) -d __DARWIN__ -t \ ! APPL -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_DIR)/include -o \ ../bin/wxluafreeze$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd) --- 178,182 ---- @COND_PLATFORM_MAC_1@ = $(SETFILE) -a C ../bin/wxluafreeze$(EXEEXT) COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd = $(REZ) -d __DARWIN__ -t \ ! APPL -i $(top_srcdir)/modules -i ./$(top_srcdir) -i $(LUA_INCLUDE_DIR) -o \ ../bin/wxluafreeze$(EXEEXT) $(top_srcdir)/art/wxlua.r @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_rezcmd = $(COND_PLATFORM_MAC_1___app_wxluafreeze___mac_rezcmd) *************** *** 229,233 **** ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) --- 230,234 ---- ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm $(__app_lua___mac_setfilecmd) *************** *** 241,245 **** @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm @COND_SHARED_0@ @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) --- 242,246 ---- @COND_SHARED_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) ! @COND_SHARED_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm @COND_SHARED_0@ @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) *************** *** 253,257 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 254,258 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 288,292 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 289,293 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) -lwxcode_$(WX_PORT)$(WXLIBPOSTFIX)_stedit-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_rezcmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 323,327 **** @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 324,328 ---- @COND_USE_WXLUACANAPP_1@../bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 358,362 **** @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 359,363 ---- @COND_USE_WXLUAFREEZEAPP_1@../bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(LDFLAGS_GUI) $(RPATH_FLAGS) $(LIBS) $(WXLUA_LIBS) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 408,412 **** app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp --- 409,413 ---- app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp *************** *** 417,421 **** app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp --- 418,422 ---- app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp *************** *** 435,439 **** app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp --- 436,440 ---- app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) --include-dir $(top_srcdir)/modules/wxbind/setup app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp *************** *** 441,445 **** app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --- 442,446 ---- app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc ! $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_INCLUDE_DIR) |