[Wxlua-commit] wxLua/apps Makefile.in,1.60,1.61

[John L. <jr...@us...>]

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

Modified Files:
	Makefile.in 
Log Message:
Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp
Rebaked with the changes


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** Makefile.in	6 May 2007 10:52:44 -0000	1.60
--- Makefile.in	24 May 2007 00:59:43 -0000	1.61
***************
*** 59,64 ****
  	-I$(LUA_DIR)/include $(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./$(top_srcdir) \
--- 59,64 ----
  	-I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUA_OBJECTS =  \
  	app_wxlua_lconsole.o \
+ 	app_wxlua_wxlua.o \
  	$(__app_wxlua___win32rc)
  APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \
***************
*** 72,80 ****
  	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
- 	app_wxluacan_wxluacan.o \
  	app_wxluacan_cancom.o \
- 	app_wxluacan_wxluacan_bind.o \
- 	app_wxluacan_cansim.o \
  	app_wxluacan_canlua.o \
  	$(__app_wxluacan___win32rc)
  APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \
--- 72,80 ----
  	$(CPPFLAGS) $(CXXFLAGS)
  APP_WXLUACAN_OBJECTS =  \
  	app_wxluacan_cancom.o \
  	app_wxluacan_canlua.o \
+ 	app_wxluacan_cansim.o \
+ 	app_wxluacan_wxluacan.o \
+ 	app_wxluacan_wxluacan_bind.o \
  	$(__app_wxluacan___win32rc)
  APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \
***************
*** 393,402 ****
  	$(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.c
  
- app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp
- 	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp
- 
  app_wxlua_lconsole.o: $(srcdir)/wxlua/src/lconsole.cpp
  	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/lconsole.cpp
  
  app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc
  	$(WX_RESCOMP) -i$< -o$@  --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include
--- 393,402 ----
  	$(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.c
  
  app_wxlua_lconsole.o: $(srcdir)/wxlua/src/lconsole.cpp
  	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/lconsole.cpp
  
+ app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp
+ 	$(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp
+ 
  app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc
  	$(WX_RESCOMP) -i$< -o$@  --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include
***************
*** 411,428 ****
  	$(WX_RESCOMP) -i$< -o$@  --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include
  
- app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp
- 	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan.cpp
- 
  app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp
  	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cancom.cpp
  
! app_wxluacan_wxluacan_bind.o: $(srcdir)/wxluacan/src/wxluacan_bind.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan_bind.cpp
  
  app_wxluacan_cansim.o: $(srcdir)/wxluacan/src/cansim.cpp
  	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cansim.cpp
  
! app_wxluacan_canlua.o: $(srcdir)/wxluacan/src/canlua.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/canlua.cpp
  
  app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc
--- 411,428 ----
  	$(WX_RESCOMP) -i$< -o$@  --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include
  
  app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp
  	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cancom.cpp
  
! app_wxluacan_canlua.o: $(srcdir)/wxluacan/src/canlua.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/canlua.cpp
  
  app_wxluacan_cansim.o: $(srcdir)/wxluacan/src/cansim.cpp
  	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cansim.cpp
  
! app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan.cpp
! 
! app_wxluacan_wxluacan_bind.o: $(srcdir)/wxluacan/src/wxluacan_bind.cpp
! 	$(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan_bind.cpp
  
  app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc