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

[Francesco M. <fr...@us...>]

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

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/util/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.in	23 Jan 2006 21:20:29 -0000	1.7
--- Makefile.in	25 Jan 2006 18:35:59 -0000	1.8
***************
*** 16,19 ****
--- 16,20 ----
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_DIR = @INSTALL_DIR@
+ top_srcdir = @top_srcdir@
  top_builddir = @top_builddir@
  bindir = @bindir@
***************
*** 34,40 ****
  @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
  @COND_DEPS_TRACKING_0@CCC = $(CC)
! @COND_USE_BIN2C_1@__util_bin2c___depname = ./../bin/bin2c$(EXEEXT)
  @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL ./../bin/bin2c$(EXEEXT)
  @COND_USE_BIN2C_1@__install_util_bin2c___depname = install_util_bin2c
  @COND_USE_BIN2C_1@__uninstall_util_bin2c___depname = uninstall_util_bin2c
--- 35,43 ----
  @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
  @COND_DEPS_TRACKING_0@CCC = $(CC)
! @COND_USE_BIN2C_1@__util_bin2c___depname = \
! @COND_USE_BIN2C_1@	$(top_srcdir)/util/../bin/bin2c$(EXEEXT)
  @COND_PLATFORM_MAC_1@__util_bin2c___mac_setfilecmd = \
! @COND_PLATFORM_MAC_1@	$(SETFILE) -t APPL \
! @COND_PLATFORM_MAC_1@	$(top_srcdir)/util/../bin/bin2c$(EXEEXT)
  @COND_USE_BIN2C_1@__install_util_bin2c___depname = install_util_bin2c
  @COND_USE_BIN2C_1@__uninstall_util_bin2c___depname = uninstall_util_bin2c
***************
*** 54,63 ****
  	rm -rf ./.deps ./.pch
  	rm -f ./*.o
! 	rm -f ./../bin/bin2c$(EXEEXT)
  
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! @COND_USE_BIN2C_1@./../bin/bin2c$(EXEEXT): $(UTIL_BIN2C_OBJECTS)
  @COND_USE_BIN2C_1@	$(CC) -o $@ $(UTIL_BIN2C_OBJECTS) $(LDFLAGS)
  @COND_USE_BIN2C_1@	
--- 57,66 ----
  	rm -rf ./.deps ./.pch
  	rm -f ./*.o
! 	rm -f $(top_srcdir)/util/../bin/bin2c$(EXEEXT)
  
  distclean: clean
  	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
  
! @COND_USE_BIN2C_1@$(top_srcdir)/util/../bin/bin2c$(EXEEXT): $(UTIL_BIN2C_OBJECTS)
  @COND_USE_BIN2C_1@	$(CC) -o $@ $(UTIL_BIN2C_OBJECTS) $(LDFLAGS)
  @COND_USE_BIN2C_1@	
***************
*** 66,76 ****
  @COND_USE_BIN2C_1@install_util_bin2c: 
  @COND_USE_BIN2C_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
! @COND_USE_BIN2C_1@	$(INSTALL_PROGRAM) ./../bin/bin2c$(EXEEXT) $(DESTDIR)$(bindir)
  
  @COND_USE_BIN2C_1@uninstall_util_bin2c: 
  @COND_USE_BIN2C_1@	rm -f $(DESTDIR)$(bindir)/bin2c$(EXEEXT)
  
! util_bin2c_bin2c.o: ./bin2c/bin2c.c
! 	$(CCC) -c -o $@ $(UTIL_BIN2C_CFLAGS) ./bin2c/bin2c.c
  
  
--- 69,79 ----
  @COND_USE_BIN2C_1@install_util_bin2c: 
  @COND_USE_BIN2C_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
! @COND_USE_BIN2C_1@	$(INSTALL_PROGRAM) $(top_srcdir)/util/../bin/bin2c$(EXEEXT) $(DESTDIR)$(bindir)
  
  @COND_USE_BIN2C_1@uninstall_util_bin2c: 
  @COND_USE_BIN2C_1@	rm -f $(DESTDIR)$(bindir)/bin2c$(EXEEXT)
  
! util_bin2c_bin2c.o: $(top_srcdir)/util/bin2c/bin2c.c
! 	$(CCC) -c -o $@ $(UTIL_BIN2C_CFLAGS) $(top_srcdir)/util/bin2c/bin2c.c