From: Francesco M. <fr...@us...> - 2006-01-27 21:58:02
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/apps Modified Files: Makefile.in Log Message: fixed top_builddir problems Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile.in 25 Jan 2006 18:35:58 -0000 1.15 --- Makefile.in 27 Jan 2006 21:57:05 -0000 1.16 *************** *** 50,56 **** @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_USE_WXLUAAPP_1@__app_wxlua___depname = \ ! @COND_USE_WXLUAAPP_1@ $(top_srcdir)/bin/wxlua$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \ ! @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL $(top_srcdir)/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 --- 50,56 ---- @COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_USE_WXLUAAPP_1@__app_wxlua___depname = \ ! @COND_USE_WXLUAAPP_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 *************** *** 60,67 **** @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ ! @COND_USE_WXLUAEDITAPP_1@ = $(top_srcdir)/bin/wxluaedit$(EXEEXT) @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \ @COND_PLATFORM_MAC_1@ = $(SETFILE) -t APPL \ ! @COND_PLATFORM_MAC_1@ $(top_srcdir)/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 --- 60,67 ---- @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o @COND_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \ ! @COND_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 *************** *** 89,99 **** rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_srcdir)/bin/wxlua$(EXEEXT) ! rm -f $(top_srcdir)/bin/wxluaedit$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_WXLUAAPP_1@$(top_srcdir)/bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxlua -lwxbind -llua $(WX_LIBS) @COND_USE_WXLUAAPP_1@ --- 89,99 ---- rm -rf ./.deps ./.pch rm -f ./*.o ! rm -f $(top_builddir)bin/wxlua$(EXEEXT) ! rm -f $(top_builddir)bin/wxluaedit$(EXEEXT) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile ! @COND_USE_WXLUAAPP_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXLUAAPP_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxlua -lwxbind -llua $(WX_LIBS) @COND_USE_WXLUAAPP_1@ *************** *** 103,112 **** @COND_USE_WXLUAAPP_1@install_app_wxlua: @COND_USE_WXLUAAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAAPP_1@ $(INSTALL_PROGRAM) $(top_srcdir)/bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAAPP_1@uninstall_app_wxlua: @COND_USE_WXLUAAPP_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXLUAEDITAPP_1@$(top_srcdir)/bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS) @COND_USE_WXLUAEDITAPP_1@ --- 103,112 ---- @COND_USE_WXLUAAPP_1@install_app_wxlua: @COND_USE_WXLUAAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAAPP_1@uninstall_app_wxlua: @COND_USE_WXLUAAPP_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) ! @COND_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) @COND_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_srcdir)/lib $(LDFLAGS_GUI) -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS) @COND_USE_WXLUAEDITAPP_1@ *************** *** 116,120 **** @COND_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_srcdir)/bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: --- 116,120 ---- @COND_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) @COND_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: |