Menu
▾
▴
[Wxlua-commit] wxLua/apps Makefile.in,1.43,1.44
|
From: Francesco M. <fr...@us...> - 2006-12-08 13:20:33
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11454/apps Modified Files: Makefile.in Log Message: Switched to latest patched bakefile (which only differs for option renaming feature). Removed customized build of LUA interpreter: we now use vanilla lua. Now BUILDDIR is set differently for shared and static builds to avoid clashes. Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** Makefile.in 15 Sep 2006 16:24:35 -0000 1.43 --- Makefile.in 8 Dec 2006 13:19:57 -0000 1.44 *************** *** 17,23 **** --- 17,26 ---- INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DIR = @INSTALL_DIR@ + BK_DEPS = @BK_DEPS@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ bindir = @bindir@ + LIBS = @LIBS@ LDFLAGS_GUI = @LDFLAGS_GUI@ CC = @CC@ *************** *** 42,54 **** DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ app_lua_lua.o - APP_VERBATIMLUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ - -I$(top_srcdir)/apps/../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) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) --- 45,52 ---- DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ ! -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) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 81,87 **** @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) ! @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_WX_PORT_GTK@WX_PORT_WITHVERSION = $(WX_PORT)$(WX_GTKPORT_VERSION) @COND_WX_PORT_MSW@WX_PORT_WITHVERSION = $(WX_PORT) --- 79,85 ---- @COND_DEPS_TRACKING_0@CCC = $(CC) ! @COND_DEPS_TRACKING_1@CCC = $(BK_DEPS) $(CC) @COND_DEPS_TRACKING_0@CXXC = $(CXX) ! @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) @COND_WX_PORT_GTK@WX_PORT_WITHVERSION = $(WX_PORT)$(WX_GTKPORT_VERSION) @COND_WX_PORT_MSW@WX_PORT_WITHVERSION = $(WX_PORT) *************** *** 90,106 **** @COND_WX_PORT_MAC@WX_PORT_WITHVERSION = $(WX_PORT) @COND_WX_PORT_MGL@WX_PORT_WITHVERSION = $(WX_PORT) ! @COND_BUILD_DEBUG_UNICODE_1@WXLIBPOSTFIX = ud ! @COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d ! @COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxlua-lua$(EXEEXT) ! @COND_PLATFORM_MAC_1@__app_verbatimlua___mac_setfilecmd \ ! @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL $(top_builddir)bin/lua5.1$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_builddir)bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)bin/wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi --- 88,102 ---- @COND_WX_PORT_MAC@WX_PORT_WITHVERSION = $(WX_PORT) @COND_WX_PORT_MGL@WX_PORT_WITHVERSION = $(WX_PORT) ! @COND_WX_DEBUG_1_WX_UNICODE_1@WXLIBPOSTFIX = ud ! @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 \ ! @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@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(top_builddir)/bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_builddir)/bin/wxlua$(EXEEXT) COND_PLATFORM_OS2_1___app_wxlua___os2_emxbindcmd = $(NM) wxlua$(EXEEXT) | if \ grep -q pmwin.763 ; then emxbind -ep wxlua$(EXEEXT) ; fi *************** *** 114,121 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_builddir)bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi --- 110,117 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(top_builddir)/bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluaedit$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluaedit___os2_emxbindcmd = $(NM) \ wxluaedit$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep wxluaedit$(EXEEXT) ; fi *************** *** 128,135 **** @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ ! @COND_USE_WXLUACANAPP_1@ $(top_builddir)bin/wxluacan$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluacan$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd = $(NM) wxluacan$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep wxluacan$(EXEEXT) ; fi --- 124,131 ---- @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ ! @COND_USE_WXLUACANAPP_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluacan___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluacan___os2_emxbindcmd = $(NM) wxluacan$(EXEEXT) \ | if grep -q pmwin.763 ; then emxbind -ep wxluacan$(EXEEXT) ; fi *************** *** 141,148 **** @COND_PLATFORM_WIN32_1@__app_wxluacan___win32rc = app_wxluacan_cansim_rc.o @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \ ! @COND_USE_WXLUAFREEZEAPP_1@ = $(top_builddir)bin/wxluafreeze$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)bin/wxluafreeze$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluafreeze___os2_emxbindcmd = $(NM) \ wxluafreeze$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ --- 137,144 ---- @COND_PLATFORM_WIN32_1@__app_wxluacan___win32rc = app_wxluacan_cansim_rc.o @COND_USE_WXLUAFREEZEAPP_1@__app_wxluafreeze___depname \ ! @COND_USE_WXLUAFREEZEAPP_1@ = $(top_builddir)/bin/wxluafreeze$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluafreeze___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_builddir)/bin/wxluafreeze$(EXEEXT) COND_PLATFORM_OS2_1___app_wxluafreeze___os2_emxbindcmd = $(NM) \ wxluafreeze$(EXEEXT) | if grep -q pmwin.763 ; then emxbind -ep \ *************** *** 158,170 **** ### Targets: ### ! all: $(top_builddir)bin/wxlua-lua$(EXEEXT) $(top_builddir)bin/lua5.1$(EXEEXT) $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all install_app_lua install_app_verbatimlua $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua 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)/lua5.1$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 154,165 ---- ### Targets: ### ! all: $(top_builddir)/bin/wxlua-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)/wxlua-lua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) *************** *** 175,190 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)bin/wxlua-lua$(EXEEXT) ! rm -f $(top_builddir)bin/lua5.1$(EXEEXT) ! rm -f $(top_builddir)bin/wxlua$(EXEEXT) ! rm -f $(top_builddir)bin/wxluaedit$(EXEEXT) ! rm -f $(top_builddir)bin/wxluacan$(EXEEXT) ! rm -f $(top_builddir)bin/wxluafreeze$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(__app_lua___mac_setfilecmd) --- 170,184 ---- 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) ! rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) ! rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! $(top_builddir)/bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) ! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -lm -llua5.1 $(__app_lua___mac_setfilecmd) *************** *** 192,214 **** install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) ! $(top_builddir)bin/lua5.1$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) ! $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -llua5.1 ! ! $(__app_verbatimlua___mac_setfilecmd) ! ! install_app_verbatimlua: ! $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) ! ! uninstall_app_verbatimlua: ! rm -f $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) ! ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)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 $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) --- 186,196 ---- install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) ! $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) uninstall_app_lua: 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) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) *************** *** 217,227 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)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 $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lstedit $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) --- 199,209 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/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 $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 -lstedit $(WX_LIBS) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) *************** *** 230,240 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! @COND_USE_WXLUACANAPP_1@$(top_builddir)bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) --- 212,222 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) ! @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) *************** *** 243,253 **** @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) --- 225,235 ---- @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) ! @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(LDFLAGS_GUI) $(LIBS) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -llua5.1 $(WX_LIBS) @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) *************** *** 256,310 **** @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_lua_lua.o: $(top_srcdir)/apps/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_LUA_CFLAGS) $(top_srcdir)/apps/../modules/lua/src/lua.c ! ! app_verbatimlua_lua.o: $(top_srcdir)/apps/../modules/lua/src/lua.c ! $(CCC) -c -o $@ $(APP_VERBATIMLUA_CFLAGS) $(top_srcdir)/apps/../modules/lua/src/lua.c ! app_wxlua_wxlua.o: $(top_srcdir)/apps/wxlua/src/wxlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/wxlua.cpp ! app_wxlua_lconsole.o: $(top_srcdir)/apps/wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/lconsole.cpp ! app_wxlua_wxlua_rc.o: $(top_srcdir)/apps/wxlua/src/wxlua.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluaedit_wxledit.o: $(top_srcdir)/apps/wxluaedit/src/wxledit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(top_srcdir)/apps/wxluaedit/src/wxledit.cpp ! app_wxluaedit_wxluaedit.o: $(top_srcdir)/apps/wxluaedit/src/wxluaedit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(top_srcdir)/apps/wxluaedit/src/wxluaedit.cpp ! app_wxluaedit_wxluaedit_rc.o: $(top_srcdir)/apps/wxluaedit/src/wxluaedit.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluacan_wxluacan.o: $(top_srcdir)/apps/wxluacan/src/wxluacan.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan.cpp ! app_wxluacan_cancom.o: $(top_srcdir)/apps/wxluacan/src/cancom.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/cancom.cpp ! app_wxluacan_wxluacan_bind.o: $(top_srcdir)/apps/wxluacan/src/wxluacan_bind.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/wxluacan_bind.cpp ! app_wxluacan_cansim.o: $(top_srcdir)/apps/wxluacan/src/cansim.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/cansim.cpp ! app_wxluacan_canlua.o: $(top_srcdir)/apps/wxluacan/src/canlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(top_srcdir)/apps/wxluacan/src/canlua.cpp ! app_wxluacan_cansim_rc.o: $(top_srcdir)/apps/wxluacan/src/cansim.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluafreeze_wxluafreeze.o: $(top_srcdir)/apps/wxluafreeze/src/wxluafreeze.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAFREEZE_CXXFLAGS) $(top_srcdir)/apps/wxluafreeze/src/wxluafreeze.cpp ! app_wxluafreeze_wxluafreeze_rc.o: $(top_srcdir)/apps/wxluafreeze/src/wxluafreeze.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --- 238,289 ---- @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)/bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @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 ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp ! app_wxlua_lconsole.o: $(srcdir)/wxlua/src/lconsole.cpp ! $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/lconsole.cpp ! app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluaedit_wxledit.o: $(srcdir)/wxluaedit/src/wxledit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(srcdir)/wxluaedit/src/wxledit.cpp ! app_wxluaedit_wxluaedit.o: $(srcdir)/wxluaedit/src/wxluaedit.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(srcdir)/wxluaedit/src/wxluaedit.cpp ! app_wxluaedit_wxluaedit_rc.o: $(srcdir)/wxluaedit/src/wxluaedit.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan.cpp ! app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cancom.cpp ! app_wxluacan_wxluacan_bind.o: $(srcdir)/wxluacan/src/wxluacan_bind.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan_bind.cpp ! app_wxluacan_cansim.o: $(srcdir)/wxluacan/src/cansim.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cansim.cpp ! app_wxluacan_canlua.o: $(srcdir)/wxluacan/src/canlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/canlua.cpp ! app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) ! app_wxluafreeze_wxluafreeze.o: $(srcdir)/wxluafreeze/src/wxluafreeze.cpp ! $(CXXC) -c -o $@ $(APP_WXLUAFREEZE_CXXFLAGS) $(srcdir)/wxluafreeze/src/wxluafreeze.cpp ! app_wxluafreeze_wxluafreeze_rc.o: $(srcdir)/wxluafreeze/src/wxluafreeze.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) *************** *** 313,315 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua 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 --- 292,294 ---- @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 |
