From: Francesco M. <fr...@us...> - 2006-12-23 11:10:59
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6780/apps Modified Files: Makefile.in Log Message: other mac bundle fixes as noted by Anders Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** Makefile.in 22 Dec 2006 20:45:05 -0000 1.50 --- Makefile.in 23 Dec 2006 11:10:52 -0000 1.51 *************** *** 35,39 **** WX_LIBS = @WX_LIBS@ WX_RESCOMP = @WX_RESCOMP@ - WX_VERSION = @WX_VERSION@ WX_PORT = @WX_PORT@ WX_VERSION_MAJOR = @WX_VERSION_MAJOR@ --- 35,38 ---- *************** *** 114,119 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ uninstall_app_wxlua - @COND_PLATFORM_MACOSX_1@__app_wxlua_bundle___depname = app_wxlua_bundle @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ --- 113,118 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ = \ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ uninstall_app_wxlua @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o + @COND_PLATFORM_MACOSX_1@__app_wxlua_bundle___depname = app_wxlua_bundle @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = \ *************** *** 132,139 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__uninstall_app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = uninstall_app_wxluaedit - @COND_PLATFORM_MACOSX_1@__app_wxluaedit_bundle___depname \ - @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @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) --- 131,138 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@__uninstall_app_wxluaedit___depname \ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ = uninstall_app_wxluaedit @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluaedit_wxluaedit_rc.o + @COND_PLATFORM_MACOSX_1@__app_wxluaedit_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluaedit_bundle @COND_USE_WXLUACANAPP_1@__app_wxluacan___depname = \ @COND_USE_WXLUACANAPP_1@ $(top_builddir)/bin/wxluacan$(EXEEXT) *************** *** 171,178 **** @COND_USE_WXLUAFREEZEAPP_1@__uninstall_app_wxluafreeze___depname \ @COND_USE_WXLUAFREEZEAPP_1@ = uninstall_app_wxluafreeze - @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ - @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle @COND_PLATFORM_WIN32_1@__app_wxluafreeze___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluafreeze_wxluafreeze_rc.o ### Targets: ### --- 170,177 ---- @COND_USE_WXLUAFREEZEAPP_1@__uninstall_app_wxluafreeze___depname \ @COND_USE_WXLUAFREEZEAPP_1@ = uninstall_app_wxluafreeze @COND_PLATFORM_WIN32_1@__app_wxluafreeze___win32rc = \ @COND_PLATFORM_WIN32_1@ app_wxluafreeze_wxluafreeze_rc.o + @COND_PLATFORM_MACOSX_1@__app_wxluafreeze_bundle___depname \ + @COND_PLATFORM_MACOSX_1@ = app_wxluafreeze_bundle ### Targets: ### *************** *** 196,206 **** rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) ! rm -rf app_wxlua.app rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) ! rm -rf app_wxluaedit.app rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) ! rm -rf app_wxluacan.app rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) ! rm -rf app_wxluafreeze.app distclean: clean --- 195,205 ---- rm -f $(top_builddir)/bin/lua$(EXEEXT) rm -f $(top_builddir)/bin/wxlua$(EXEEXT) ! rm -rf wxLua.app rm -f $(top_builddir)/bin/wxluaedit$(EXEEXT) ! rm -rf wxLuaEdit.app rm -f $(top_builddir)/bin/wxluacan$(EXEEXT) ! rm -rf wxLuaCan.app rm -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) ! rm -rf wxLuaFreeze.app distclean: clean *************** *** 232,256 **** @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! app_wxlua.app/Contents/PkgInfo: $(__app_wxlua___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxlua.app/Contents ! mkdir -p app_wxlua.app/Contents/MacOS ! mkdir -p app_wxlua.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxlua/" \ ! -e "s/VERSION/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxlua.app/Contents/Info.plist ! echo -n "APPL????" >app_wxlua.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxlua$(EXEEXT) app_wxlua.app/Contents/MacOS/app_wxlua ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxlua.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxlua_bundle: app_wxlua.app/Contents/PkgInfo @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) --- 231,255 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! wxLua.app/Contents/PkgInfo: $(__app_wxlua___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLua.app/Contents ! mkdir -p wxLua.app/Contents/MacOS ! mkdir -p wxLua.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxlua/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLua.app/Contents/Info.plist ! echo -n "APPL????" >wxLua.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxlua$(EXEEXT) wxLua.app/Contents/MacOS/app_wxlua ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLua.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxlua_bundle: wxLua.app/Contents/PkgInfo @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) *************** *** 267,291 **** @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! app_wxluaedit.app/Contents/PkgInfo: $(__app_wxluaedit___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxluaedit.app/Contents ! mkdir -p app_wxluaedit.app/Contents/MacOS ! mkdir -p app_wxluaedit.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxluaedit/" \ ! -e "s/VERSION/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluaedit.app/Contents/Info.plist ! echo -n "APPL????" >app_wxluaedit.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluaedit$(EXEEXT) app_wxluaedit.app/Contents/MacOS/app_wxluaedit ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluaedit.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluaedit_bundle: app_wxluaedit.app/Contents/PkgInfo @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) --- 266,290 ---- @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) ! wxLuaEdit.app/Contents/PkgInfo: $(__app_wxluaedit___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLuaEdit.app/Contents ! mkdir -p wxLuaEdit.app/Contents/MacOS ! mkdir -p wxLuaEdit.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxluaedit/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaEdit.app/Contents/Info.plist ! echo -n "APPL????" >wxLuaEdit.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluaedit$(EXEEXT) wxLuaEdit.app/Contents/MacOS/app_wxluaedit ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaEdit.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluaedit_bundle: wxLuaEdit.app/Contents/PkgInfo @COND_USE_WXLUACANAPP_1@$(top_builddir)/bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) *************** *** 302,326 **** @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! app_wxluacan.app/Contents/PkgInfo: $(__app_wxluacan___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxluacan.app/Contents ! mkdir -p app_wxluacan.app/Contents/MacOS ! mkdir -p app_wxluacan.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxluacan/" \ ! -e "s/VERSION/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluacan.app/Contents/Info.plist ! echo -n "APPL????" >app_wxluacan.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluacan$(EXEEXT) app_wxluacan.app/Contents/MacOS/app_wxluacan ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluacan.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluacan_bundle: app_wxluacan.app/Contents/PkgInfo @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) --- 301,325 ---- @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) ! wxLuaCan.app/Contents/PkgInfo: $(__app_wxluacan___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLuaCan.app/Contents ! mkdir -p wxLuaCan.app/Contents/MacOS ! mkdir -p wxLuaCan.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxluacan/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaCan.app/Contents/Info.plist ! echo -n "APPL????" >wxLuaCan.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluacan$(EXEEXT) wxLuaCan.app/Contents/MacOS/app_wxluacan ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaCan.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluacan_bundle: wxLuaCan.app/Contents/PkgInfo @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)/bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) *************** *** 337,361 **** @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! app_wxluafreeze.app/Contents/PkgInfo: $(__app_wxluafreeze___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns ! mkdir -p app_wxluafreeze.app/Contents ! mkdir -p app_wxluafreeze.app/Contents/MacOS ! mkdir -p app_wxluafreeze.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxluafreeze/" \ ! -e "s/VERSION/$(WX_VERSION)/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >app_wxluafreeze.app/Contents/Info.plist ! echo -n "APPL????" >app_wxluafreeze.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) app_wxluafreeze.app/Contents/MacOS/app_wxluafreeze ! cp -f $(top_srcdir)/distrib/macbundle/Info.plist.in/wxLua.icns app_wxluafreeze.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluafreeze_bundle: app_wxluafreeze.app/Contents/PkgInfo app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c --- 336,360 ---- @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! wxLuaFreeze.app/Contents/PkgInfo: $(__app_wxluafreeze___depname) $(top_srcdir)/distrib/macbundle/Info.plist.in $(top_srcdir)/distrib/macbundle/wxLua.icns ! mkdir -p wxLuaFreeze.app/Contents ! mkdir -p wxLuaFreeze.app/Contents/MacOS ! mkdir -p wxLuaFreeze.app/Contents/Resources sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ -e "s/EXECUTABLE/app_wxluafreeze/" \ ! -e "s/VERSION/2.8.0/" \ ! $(top_srcdir)/distrib/macbundle/Info.plist.in >wxLuaFreeze.app/Contents/Info.plist ! echo -n "APPL????" >wxLuaFreeze.app/Contents/PkgInfo ! ln -f $(top_builddir)/bin/wxluafreeze$(EXEEXT) wxLuaFreeze.app/Contents/MacOS/app_wxluafreeze ! cp -f $(top_srcdir)/distrib/macbundle/wxLua.icns wxLuaFreeze.app/Contents/Resources/wxLua.icns ! @COND_PLATFORM_MACOSX_1@app_wxluafreeze_bundle: wxLuaFreeze.app/Contents/PkgInfo app_lua_lua.o: $(srcdir)/../modules/lua/src/lua.c |