Menu
▾
▴
[Wxlua-commit] wxLua/apps Makefile.in,1.39,1.40
|
From: Francesco M. <fr...@us...> - 2006-05-20 13:12:49
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8798/apps Modified Files: Makefile.in Log Message: updated all build system trying to fix SHARED builds Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** Makefile.in 8 May 2006 15:50:47 -0000 1.39 --- Makefile.in 20 May 2006 13:12:34 -0000 1.40 *************** *** 21,28 **** --- 21,31 ---- bindir = @bindir@ LDFLAGS_GUI = @LDFLAGS_GUI@ + CC = @CC@ CXX = @CXX@ + CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ + WX_CFLAGS = @WX_CFLAGS@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_LIBS = @WX_LIBS@ *************** *** 32,39 **** --- 35,54 ---- WX_VERSION_MINOR = @WX_VERSION_MINOR@ WX_GTKPORT_VERSION = @WX_GTKPORT_VERSION@ + LUA_PLATFORM_SPECIFIC_CFLAGS = @LUA_PLATFORM_SPECIFIC_CFLAGS@ + LUA_PLATFORM_SPECIFIC_LDFLAGS = @LUA_PLATFORM_SPECIFIC_LDFLAGS@ ### Variables: ### 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_LUAVERBATIM_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ + -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ + $(LUA_PLATFORM_SPECIFIC_CFLAGS) $(CPPFLAGS) $(CFLAGS) + APP_LUAVERBATIM_OBJECTS = \ + app_luaverbatim_lua.o APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) \ $(CPPFLAGS) $(CXXFLAGS) *************** *** 65,70 **** ### Conditionally set variables: ### ! @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_WX_PORT_GTK@WX_PORT_WITHVERSION = $(WX_PORT)$(WX_GTKPORT_VERSION) @COND_WX_PORT_MSW@WX_PORT_WITHVERSION = $(WX_PORT) --- 80,87 ---- ### Conditionally set variables: ### ! @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) *************** *** 76,79 **** --- 93,101 ---- @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_luaverbatim___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@ = \ *************** *** 136,146 **** ### Targets: ### ! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname) $(__app_wxluacan___depname) $(__app_wxluafreeze___depname) ! install: all $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install $(STRIP) $(DESTDIR)$(bindir)/wxlua$(EXEEXT) $(STRIP) $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) --- 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_luaverbatim $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua uninstall_app_luaverbatim $(__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) *************** *** 151,154 **** --- 175,180 ---- 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) *************** *** 159,162 **** --- 185,212 ---- 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) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lm + + $(__app_lua___mac_setfilecmd) + + 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_LUAVERBATIM_OBJECTS) + $(CC) -o $@ $(APP_LUAVERBATIM_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -llua5.1 -lm + + $(__app_luaverbatim___mac_setfilecmd) + + install_app_luaverbatim: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) + + uninstall_app_luaverbatim: + 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) *************** *** 211,214 **** --- 261,270 ---- @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_luaverbatim_lua.o: $(top_srcdir)/apps/../modules/lua/src/lua.c + $(CCC) -c -o $@ $(APP_LUAVERBATIM_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 *************** *** 257,259 **** @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze --- 313,315 ---- @IF_GNU_MAKE@-include .deps/*.d ! .PHONY: all install uninstall clean distclean install_app_lua uninstall_app_lua install_app_luaverbatim uninstall_app_luaverbatim install_app_wxlua uninstall_app_wxlua install_app_wxluaedit uninstall_app_wxluaedit install_app_wxluacan uninstall_app_wxluacan install_app_wxluafreeze uninstall_app_wxluafreeze |
