[Wxlua-commit] wxLua/apps Makefile.in,1.14,1.15

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10627/apps

Modified Files:
	Makefile.in 
Log Message:
fixed problem with top_srcdir (autoconf) fixed EOL for MSVC6prj; switch to 26 as wx default version

Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.in	23 Jan 2006 21:20:28 -0000	1.14
--- Makefile.in	25 Jan 2006 18:35:58 -0000	1.15
***************
*** 18,21 ****
--- 18,22 ----
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+ top_srcdir = @top_srcdir@
  top_builddir = @top_builddir@
  bindir = @bindir@
***************
*** 31,41 ****

  DESTDIR = 
! APP_WXLUA_CXXFLAGS =  -I../modules  $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	app_wxlua_wxlua.o \
  	app_wxlua_lconsole.o \
  	$(__app_wxlua___win32rc)
! APP_WXLUAEDIT_CXXFLAGS = -I../modules -I$(WXSTEDIT)/include $(WX_CXXFLAGS) \
! 	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	app_wxluaedit_wxledit.o \
--- 32,43 ----

  DESTDIR = 
! APP_WXLUA_CXXFLAGS = -I$(top_srcdir)/modules $(WX_CXXFLAGS) $(CPPFLAGS) \
! 	$(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	app_wxlua_wxlua.o \
  	app_wxlua_lconsole.o \
  	$(__app_wxlua___win32rc)
! APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I$(WXSTEDIT)/include \
! 	$(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUAEDIT_OBJECTS =  \
  	app_wxluaedit_wxledit.o \
***************
*** 47,53 ****
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
! @COND_USE_WXLUAAPP_1@__app_wxlua___depname = ../bin/wxlua$(EXEEXT)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ../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
--- 49,56 ----
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @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
***************
*** 57,63 ****
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
  @COND_USE_WXLUAEDITAPP_1@__app_wxluaedit___depname \
! @COND_USE_WXLUAEDITAPP_1@	= ../bin/wxluaedit$(EXEEXT)
  @COND_PLATFORM_MAC_1@__app_wxluaedit___mac_setfilecmd \
! @COND_PLATFORM_MAC_1@	= $(SETFILE) -t APPL ../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_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
***************
*** 85,96 ****
  	rm -rf ./.deps ./.pch
  	rm -f ./*.o
! 	rm -f ../bin/wxlua$(EXEEXT)
! 	rm -f ../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@../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! @COND_USE_WXLUAAPP_1@	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI)  -lwxluasocket -lwxluadebug -lwxlua -lwxbind -llua $(WX_LIBS)
  @COND_USE_WXLUAAPP_1@	
  @COND_USE_WXLUAAPP_1@	$(__app_wxlua___mac_setfilecmd)
--- 89,100 ----
  	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@	
  @COND_USE_WXLUAAPP_1@	$(__app_wxlua___mac_setfilecmd)
***************
*** 99,109 ****
  @COND_USE_WXLUAAPP_1@install_app_wxlua: 
  @COND_USE_WXLUAAPP_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
! @COND_USE_WXLUAAPP_1@	$(INSTALL_PROGRAM) ../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@../bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc)
! @COND_USE_WXLUAEDITAPP_1@	$(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L../lib $(LDFLAGS_GUI)  -lwxluasocket -lwxluadebug -lwxbind -lwxlua -llua $(WX_LIBS)
  @COND_USE_WXLUAEDITAPP_1@	
  @COND_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)
--- 103,113 ----
  @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@	
  @COND_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)
***************
*** 112,137 ****
  @COND_USE_WXLUAEDITAPP_1@install_app_wxluaedit: 
  @COND_USE_WXLUAEDITAPP_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
! @COND_USE_WXLUAEDITAPP_1@	$(INSTALL_PROGRAM) ../bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir)

  @COND_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: 
  @COND_USE_WXLUAEDITAPP_1@	rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT)

! app_wxlua_wxlua.o: ./wxlua/src/wxlua.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) ./wxlua/src/wxlua.cpp

! app_wxlua_lconsole.o: ./wxlua/src/lconsole.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) ./wxlua/src/lconsole.cpp

! app_wxlua_wxlua_rc.o: ./wxlua/src/wxlua.rc
! 	$(WINDRES) -i$< -o$@ --include-dir ../modules

! app_wxluaedit_wxledit.o: ./wxluaedit/src/wxledit.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) ./wxluaedit/src/wxledit.cpp

! app_wxluaedit_wxluaedit.o: ./wxluaedit/src/wxluaedit.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) ./wxluaedit/src/wxluaedit.cpp

! app_wxluaedit_wxluaedit_rc.o: ./wxluaedit/src/wxluaedit.rc
! 	$(WINDRES) -i$< -o$@ --include-dir ../modules

--- 116,141 ----
  @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: 
  @COND_USE_WXLUAEDITAPP_1@	rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT)

! app_wxlua_wxlua.o: $(top_srcdir)/apps/wxlua/src/wxlua.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/wxlua.cpp

! app_wxlua_lconsole.o: $(top_srcdir)/apps/wxlua/src/lconsole.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(top_srcdir)/apps/wxlua/src/lconsole.cpp

! app_wxlua_wxlua_rc.o: $(top_srcdir)/apps/wxlua/src/wxlua.rc
! 	$(WINDRES) -i$< -o$@ --include-dir $(top_srcdir)/modules

! app_wxluaedit_wxledit.o: $(top_srcdir)/apps/wxluaedit/src/wxledit.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(top_srcdir)/apps/wxluaedit/src/wxledit.cpp

! app_wxluaedit_wxluaedit.o: $(top_srcdir)/apps/wxluaedit/src/wxluaedit.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUAEDIT_CXXFLAGS) $(top_srcdir)/apps/wxluaedit/src/wxluaedit.cpp

! app_wxluaedit_wxluaedit_rc.o: $(top_srcdir)/apps/wxluaedit/src/wxluaedit.rc
! 	$(WINDRES) -i$< -o$@ --include-dir $(top_srcdir)/modules