Update of /cvsroot/wxlua/wxLua/apps
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2609/apps
Modified Files:
Makefile.in
Log Message:
don't build lua interpreter and lua compiler if using system lua
Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** Makefile.in 15 Jan 2008 18:37:26 -0000 1.68
--- Makefile.in 15 Jan 2008 20:19:55 -0000 1.69
***************
*** 97,109 ****
@COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d
@COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u
@COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true
@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_0@__app_luac___mac_setfilecmd = @true
@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@ = \
--- 97,114 ----
@COND_BUILD_DEBUG_UNICODE_0@WXLIBPOSTFIX = d
@COND_BUILD_RELEASE_UNICODE_1@WXLIBPOSTFIX = u
+ @COND_USE_SYSTEM_LUA_0@__app_lua___depname = ../bin/lua$(EXEEXT)
@COND_PLATFORM_MAC_0@__app_lua___mac_setfilecmd = @true
@COND_PLATFORM_MAC_1@__app_lua___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/lua$(EXEEXT)
! @COND_USE_SYSTEM_LUA_0@__install_app_lua___depname = install_app_lua
! @COND_USE_SYSTEM_LUA_0@__uninstall_app_lua___depname = uninstall_app_lua
! @COND_SHARED_0_USE_SYSTEM_LUA_0@__app_luac___depname = ../bin/luac$(EXEEXT)
@COND_PLATFORM_MAC_0@__app_luac___mac_setfilecmd = @true
@COND_PLATFORM_MAC_1@__app_luac___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL ../bin/luac$(EXEEXT)
! @COND_SHARED_0_USE_SYSTEM_LUA_0@__install_app_luac___depname \
! @COND_SHARED_0_USE_SYSTEM_LUA_0@ = install_app_luac
! @COND_SHARED_0_USE_SYSTEM_LUA_0@__uninstall_app_luac___depname \
! @COND_SHARED_0_USE_SYSTEM_LUA_0@ = 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@ = \
***************
*** 198,206 ****
### 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
--- 203,211 ----
### Targets: ###
! all: $(__app_lua___depname) $(__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___depname) $(__install_app_luac___depname) $(__install_app_wxlua___depname) $(__install_app_wxluaedit___depname) $(__install_app_wxluacan___depname) $(__install_app_wxluafreeze___depname)
! uninstall: $(__uninstall_app_lua___depname) $(__uninstall_app_luac___depname) $(__uninstall_app_wxlua___depname) $(__uninstall_app_wxluaedit___depname) $(__uninstall_app_wxluacan___depname) $(__uninstall_app_wxluafreeze___depname)
install-strip: install
***************
*** 229,255 ****
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
! ../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS)
! $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm
!
! $(__app_lua___mac_setfilecmd)
! install_app_lua:
! $(INSTALL_DIR) $(DESTDIR)$(bindir)
! $(INSTALL_PROGRAM) ../bin/lua$(EXEEXT) $(DESTDIR)$(bindir)
! uninstall_app_lua:
! 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_LIB_DIR) $(RPATH_FLAGS) $(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)
--- 234,260 ----
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
! @COND_USE_SYSTEM_LUA_0@../bin/lua$(EXEEXT): $(APP_LUA_OBJECTS)
! @COND_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm
! @COND_USE_SYSTEM_LUA_0@
! @COND_USE_SYSTEM_LUA_0@ $(__app_lua___mac_setfilecmd)
! @COND_USE_SYSTEM_LUA_0@install_app_lua:
! @COND_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
! @COND_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/lua$(EXEEXT) $(DESTDIR)$(bindir)
! @COND_USE_SYSTEM_LUA_0@uninstall_app_lua:
! @COND_USE_SYSTEM_LUA_0@ rm -f $(DESTDIR)$(bindir)/lua$(EXEEXT)
! @COND_SHARED_0_USE_SYSTEM_LUA_0@../bin/luac$(EXEEXT): $(APP_LUAC_OBJECTS)
! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(CC) -o $@ $(APP_LUAC_OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib -L$(LUA_LIB_DIR) $(RPATH_FLAGS) $(LUA_PLATFORM_SPECIFIC_LDFLAGS) $(LIBS) -llua5.1 -lm
! @COND_SHARED_0_USE_SYSTEM_LUA_0@
! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(__app_luac___mac_setfilecmd)
! @COND_SHARED_0_USE_SYSTEM_LUA_0@install_app_luac:
! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_PROGRAM) ../bin/luac$(EXEEXT) $(DESTDIR)$(bindir)
! @COND_SHARED_0_USE_SYSTEM_LUA_0@uninstall_app_luac:
! @COND_SHARED_0_USE_SYSTEM_LUA_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)
|
