SHA1 Hash:	fb1fa7f1a6af4a4fe5fbe62edf83da74f10a16a6
Date:	2009-12-09 22:05:46
Edited User:	jeremy_c
Original User:	Jeremy
Comment:	Make it easier to do out of source builds by optionally including config.mak or config.w32.
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• date=2009-12-09 22:05:46 added by [6682198e79] on 2009-12-09 22:22:39
• sym-trunk inherited from [a28c83647d]
• user=jeremy_c added by [6682198e79] on 2009-12-09 22:22:39

Modified BUILD.txt from [334b80c575] to [4f7988767e].

@@ -2,16 +2,43 @@
 But there is a lot of generated code, so you will probably want to
 use the Makefile.  To do a complete build, just type:
 
    make
 
-That should work out-of-the-box on Macs and Linux systems.  If
-you have trouble, or you want to do something fancy, just edit
-the Makefile in the top-level folder.  There are 5 things you
-might want to change in the Makefile.  All 5 things are well
-commented.  The complete Makefile is only a few dozen lines long.
-Do not be intimidated.
+That should work out-of-the-box on Macs and Linux systems. If you are
+building on a Windows box, install MinGW as well as MinGW's make (or
+MSYS). You can then type:
+
+  make -f Makefile.w32
+
+If you have trouble, or you want to do something fancy, just look at
+top level makefile. There are 5 configuration options that are all well
+commented. Instead of editing the Makefile, create a new file named
+config.mak (for Macs and Linux systems) or config.w32 (for Windows) and
+override any settings you wish there.
+
+Out of source builds?
+--------------------------------------------------------------------------
+
+An out of source build is pretty easy:
+
+  1. Make a new directory to do the builds in.
+  2. Create a config.mak (or .w32 ... explained above) and add something
+  along the lines of:
+
+    SRCDIR=../src
+
+  3. From that directory, type:
+
+    Macs and Linux:
+      $ make -f ../Makefile
+
+    Windows:
+      C:\fossil\build> make -f ../Makefile.w32
+
+This will now keep all generates files seperate from the maintained
+source code.
 
 --------------------------------------------------------------------------
 
 Here are some notes on what is happening behind the scenes:
 

Modified Makefile from [c357142045] to [21a564c8f5].

@@ -43,9 +43,13 @@
 
 
 #### Tcl shell for use in running the fossil testsuite.
 #
 TCLSH = tclsh
+
+#### Include a configuration file that can override any one of these settings.
+#
+-include config.mak
 
 # You should not need to change anything below this line
 ###############################################################################
 include $(SRCDIR)/main.mk

Modified Makefile.w32 from [900e354562] to [a8929670d9].

@@ -41,9 +41,13 @@
 LIB = -lmingwex -lz -lws2_32
 
 #### Tcl shell for use in running the fossil testsuite.
 #
 TCLSH = tclsh
+
+#### Include a configuration file that can override any one of these settings.
+#
+-include config.w32
 
 # You should not need to change anything below this line
 ###############################################################################
 include $(SRCDIR)/main.mk