From: Francesco M. <fr...@us...> - 2007-05-06 10:53:20
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17056/apps Modified Files: Makefile.in Log Message: don't build LUAC when SHARED==1 as it uses Lua private functions not exported in shared libs of Lua Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Makefile.in 6 May 2007 10:16:30 -0000 1.59 --- Makefile.in 6 May 2007 10:52:44 -0000 1.60 *************** *** 95,100 **** --- 95,103 ---- @COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT) + @COND_SHARED_0@__app_luac___depname = ../bin/luac$(EXEEXT) @COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT) + @COND_SHARED_0@__install_app_luac___depname = install_app_luac + @COND_SHARED_0@__uninstall_app_luac___depname = uninstall_app_luac @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@__app_wxlua___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ *************** *** 186,194 **** ### 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 --- 189,197 ---- ### Targets: ### ! all: ../bin/lua$(EXEEXT) $(__app_luac___depname) $(__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___depname) $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname) ! uninstall: uninstall_app_lua $(__uninstall_app_luac___depname) $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname) install-strip: install *************** *** 229,243 **** 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 $(__app) $(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) --- 232,246 ---- rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT) ! @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 $(__app) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm ! @COND_SHARED_0@ ! @COND_SHARED_0@ $(__app_luac___mac_setfilecmd) ! @COND_SHARED_0@install_app_luac: ! @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_SHARED_0@ $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_SHARED_0@uninstall_app_luac: ! @COND_SHARED_0@ 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) |