Menu
▾
▴
[Wxlua-commit] wxLua/apps Makefile.in,1.47,1.48
|
From: Francesco M. <fr...@us...> - 2006-12-19 22:24:44
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21377/apps Modified Files: Makefile.in Log Message: get rid of WX_UNICODE and WX_DEBUG (again); removed the 'verbatim' name from modules and apps; added explanatory comments about the naming of our vanilla lua; renamed our lua interpreter to just 'lua' (as for the standard lua distro); now LUA_DIR is set correctly for windows builds; now USE_SYSTEM_LUA and LUA_DIR are passed through subprojects Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** Makefile.in 19 Dec 2006 21:11:57 -0000 1.47 --- Makefile.in 19 Dec 2006 22:24:10 -0000 1.48 *************** *** 45,53 **** DESTDIR = ! APP_VERBATIMLUA_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_VERBATIMLUA_OBJECTS = \ ! app_verbatimlua_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) --- 45,53 ---- 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_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) *************** *** 93,99 **** @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_0_WX_UNICODE_1@WXLIBPOSTFIX = u ! @COND_PLATFORM_MAC_1@__app_verbatimlua___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ --- 93,98 ---- @COND_WX_DEBUG_1_WX_UNICODE_0@WXLIBPOSTFIX = d @COND_WX_DEBUG_0_WX_UNICODE_1@WXLIBPOSTFIX = u ! @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)/bin/lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 156,167 **** ### Targets: ### ! all: $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_verbatimlua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_verbatimlua $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install ! $(STRIP) $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 155,166 ---- ### Targets: ### ! all: $(top_builddir)/bin/lua$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___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) *************** *** 172,176 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)/bin/wxlua-lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) --- 171,175 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) *************** *** 181,195 **** rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 ! $(__app_verbatimlua___mac_setfilecmd) ! install_app_verbatimlua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_verbatimlua: ! rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) --- 180,194 ---- rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_DIR)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 ! $(__app_lua___mac_setfilecmd) ! install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)/bin/lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: ! rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) *************** *** 245,250 **** @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_verbatimlua_lua.o: $(srcdir)/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_VERBATIMLUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp --- 244,249 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(srcdir)/../modules/lua/src/lua.c app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp *************** *** 294,296 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_verbatimlua uninstall_app_verbatimlua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 293,295 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze |
