Menu
▾
▴
[Wxlua-commit] wxLua/apps Makefile.in,1.57,1.58
|
From: Francesco M. <fr...@us...> - 2007-05-06 10:02:27
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31657/apps Modified Files: Makefile.in Log Message: added LUAC target Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** Makefile.in 23 Apr 2007 22:44:26 -0000 1.57 --- Makefile.in 6 May 2007 10:01:53 -0000 1.58 *************** *** 50,53 **** --- 50,59 ---- 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) *************** *** 89,92 **** --- 95,100 ---- @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT) + @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \ + @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 177,188 **** ### Targets: ### ! all: ../bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all install_app_lua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/lua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 185,197 ---- ### Targets: ### ! all: ../bin/lua$(EXEEXT) ../bin/luac$(EXEEXT) $(__app_wxlua___depname) $(__app_wxlua_bundle___depname) $(__app_wxluaedit___depname) $(__app_wxluaedit_bundle___depname) $(__app_wxluacan___depname) $(__app_wxluacan_bundle___depname) $(__app_wxluafreeze___depname) $(__app_wxluafreeze_bundle___depname) ! install: all install_app_lua install_app_luac $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua uninstall_app_luac $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/lua$(EXEEXT) + $(STRIP) $(DESTDIR)$(bindir)/luac$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) *************** *** 194,197 **** --- 203,207 ---- rm -f ./*.o rm -f ../bin/lua$(EXEEXT) + rm -f ../bin/luac$(EXEEXT) rm -f ../bin/wxlua$(EXEEXT) rm -rf wxLua.app *************** *** 218,223 **** rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) @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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(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) --- 228,245 ---- rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) + ../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS) + $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm + + $(__app_luac___mac_setfilecmd) + + install_app_luac: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) + + uninstall_app_luac: + rm -f $(DESTDIR)$(bindir)/luac$(EXEEXT) + @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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(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_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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -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) --- 276,280 ---- @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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -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_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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 311,315 ---- @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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_rezcmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 324,328 **** @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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 346,350 ---- @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) $(LIBS) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_rezcmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 361,364 **** --- 383,392 ---- $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c + app_luac_luac.o: $(srcdir)/../modules/lua/src/luac.c + $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/luac.c + + app_luac_print.o: $(srcdir)/../modules/lua/src/print.c + $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.c + app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp *************** *** 407,409 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze app_wxluafreeze_bundle --- 435,437 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_luac uninstall_app_luac install_app_wxlua uninstall_app_wxlua app_wxlua_bundle install_app_wxluaedit uninstall_app_wxluaedit app_wxluaedit_bundle install_app_wxluacan uninstall_app_wxluacan app_wxluacan_bundle install_app_wxluafreeze uninstall_app_wxluafreeze app_wxluafreeze_bundle |
