From 23b46378b4ba8aba5d53581906ec5a798087b2da Mon Sep 17 00:00:00 2001 From: Jean-Claude Wippler Date: Wed, 4 Apr 2007 21:50:07 +0000 Subject: [PATCH] fix glob for mingw git-svn-id: svn://svn.equi4.com/kitgen/trunk@1391 9e558909-932a-0410-a563-af77432da1eb --- README | 16 ++++++++-------- makefile.include | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README b/README index 3b5dc2b..4d87c42 100644 --- a/README +++ b/README @@ -15,6 +15,7 @@ Kitgen is pronounced "kit-chen". News ---- + * 2007-04-04 : added kbs.tcl, the Kitgen Build System - see README.kbs * 2007-01-11 : fixed a vfs thread issue in boot.tcl, by Jeff Hobbs * 2006-12-20 : fixed typo, mention the FFF feedback forum below * 2006-12-15 : added *BSD support (use gmake i.s.o. make) @@ -132,24 +133,23 @@ The key trick is to get the directory structure right so that `sh config.sh` and base-*/ kit-*/ tcl/ - tclvfs/ - thread/ tk/ - vlerq/ - zlib/ 8.5/ base-*/ kit-*/ tcl/ + tk/ + 8.x/ tclvfs/ thread/ - tk/ - vlerq/ + vqtcl/ zlib/ config.sh files/ ... +The 8.x/ directory contains the source code which works with both 8.4 and 8.5. + You do not have to have both 8.4/ and 8.5/, nor do you have to give them exactly these names, but they must start with "8". There can be multiple sets of code sources co-existing next to each other even, if needed. Symlinks should work. @@ -252,13 +252,13 @@ are no build/* directories present. One way to force this is `make clean` which does a `rm -rf build` . Otherwise, for directories which already exist, the rebuild is skipped. To force a rebuild of only the vlerq extension, do: - rm -rf build/vlerq && make + rm -rf build/vqtcl && make The sub-directories of build/ are the areas where each call to the respective "configure" script places its results. When debugging either a build or the extension itself, it may be more convenient to work in that specific subdir: - cd builds/vlerq && make + cd builds/vqtcl && make After that, you can do `cd ../.. && make` to complete the tclkit builds. diff --git a/makefile.include b/makefile.include index 41cdb62..7025bd7 100644 --- a/makefile.include +++ b/makefile.include @@ -35,13 +35,13 @@ tclkit-gui$(EXE): kit-cli$(EXE) kit-gui$(EXE) ../../setupvfs.tcl build/files kit-cli$(EXE): build/tcl build/tclvfs build/vqtcl build/zlib $(KITSRC) $(CC) -o $@ $(CFLAGS) $(KITSRC) -Ibuild/include \ -DKIT_LITE -DTCL_LOCAL_APPINIT=TclKit_AppInit -DSTATIC_BUILD \ - build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/libvqtcl4*.a \ + build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/*vqtcl4*.a \ build/lib/libz.a build/lib/libtcl8*.a $(LDFLAGS) kit-gui$(EXE): build/tcl build/tk build/tclvfs build/vqtcl build/zlib $(KITSRC) $(CC) -o $@ $(CFLAGS) $(KITSRC) -Ibuild/include \ -DKIT_LITE -DTCL_LOCAL_APPINIT=TclKit_AppInit -DSTATIC_BUILD \ - build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/libvqtcl4*.a \ + build/lib/vfs1*/*vfs1*.a build/lib/vqtcl4*/*vqtcl4*.a \ -DKIT_INCLUDES_TK build/lib/libtk8*.a \ build/lib/libz.a build/lib/libtcl8*.a $(LDFLAGS) $(GUI_OPTS) -- 2.23.0