[Wxlua-commit] wxLua/apps Makefile.in,1.7,1.8

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

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

Modified Files:
	Makefile.in 
Log Message:
formatting for bakfiles
added USE_WXLUAAPP, USE_WXLUAEDITAPP


Index: Makefile.in
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	23 Nov 2005 20:33:14 -0000	1.7
--- Makefile.in	24 Nov 2005 21:34:15 -0000	1.8
***************
*** 30,33 ****
--- 30,38 ----
  	app_wxlua_lconsole.o \
  	$(__app_wxlua___win32rc)
+ APP_WXLUAEDIT_CXXFLAGS = -I../modules $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
+ APP_WXLUAEDIT_OBJECTS =  \
+ 	app_wxluaedit_wxledit.o \
+ 	app_wxluaedit_wxluaedit.o \
+ 	$(__app_wxluaedit___win32rc)
  
  ### Conditionally set variables: ###
***************
*** 35,45 ****
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_PLATFORM_MAC_1@__app_wxlua___mac_setfilecmd = \
  @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL wxlua$(EXEEXT)
  @COND_PLATFORM_WIN32_1@__app_wxlua___win32rc = app_wxlua_wxlua_rc.o
  
  ### Targets: ###
  
! all: ../bin/wxlua$(EXEEXT)
  
  install: all
--- 40,57 ----
  @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 wxlua$(EXEEXT)
  @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 wxluaedit$(EXEEXT)
+ @COND_PLATFORM_WIN32_1@__app_wxluaedit___win32rc = \
+ @COND_PLATFORM_WIN32_1@	app_wxluaedit_wxluaedit_rc.o
  
  ### Targets: ###
  
! all: $(__app_wxlua___depname) $(__app_wxluaedit___depname)
  
  install: all
***************
*** 53,64 ****
  	rm -f ./*.o
  	rm -f ../bin/wxlua$(EXEEXT)
  
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! ../bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc)
! 	$(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L../lib  -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua $(WX_LIBS)
! 	
! 	$(__app_wxlua___mac_setfilecmd)
  
  app_wxlua_wxlua.o: ./wxlua/src/wxlua.cpp
--- 65,82 ----
  	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  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
! @COND_USE_WXLUAAPP_1@	
! @COND_USE_WXLUAAPP_1@	$(__app_wxlua___mac_setfilecmd)
! 
! @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  $(WX_LIBS) -lwxluadebug -lwxluasocket -lwxlua -lwxbind -llua
! @COND_USE_WXLUAEDITAPP_1@	
! @COND_USE_WXLUAEDITAPP_1@	$(__app_wxluaedit___mac_setfilecmd)
  
  app_wxlua_wxlua.o: ./wxlua/src/wxlua.cpp
***************
*** 71,74 ****
--- 89,101 ----
  	$(RESCOMP) -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: ./wxlua/src/wxluaedit.rc
+ 	$(RESCOMP) -i$< -o$@ --include-dir ../modules
+ 
  
  # Include dependency info, if present: