Fossil SCM
Remove the Cygwin-specific Makefile, as the option --disable-internal-sqlite has the same effect. Document this.
Commit
5610dc4edfcacf06db841c5b1a1121bbeb16ceb4
Parent
fc9970678ea9f1d…
3 files changed
-43
-1
+5
D
Makefile.Cygwin.in
-43
| --- a/Makefile.Cygwin.in | ||
| +++ b/Makefile.Cygwin.in | ||
| @@ -1,43 +0,0 @@ | ||
| 1 | -#!/usr/bin/make | |
| 2 | -# | |
| 3 | -# This is the top-level makefile for Fossil when the build is occurring | |
| 4 | -# on the Cygwin platform. | |
| 5 | -# | |
| 6 | -#### The toplevel directory of the source tree. Fossil can be built | |
| 7 | -# in a directory that is separate from the source tree. Just change | |
| 8 | -# the following to point from the build directory to the src/ folder. | |
| 9 | -# | |
| 10 | -SRCDIR = @srcdir@/src | |
| 11 | - | |
| 12 | -#### The directory into which object code files should be written. | |
| 13 | -# Having a "./" prefix in the value of this variable breaks our use of the | |
| 14 | -# "makeheaders" tool when running make on the MinGW platform, apparently | |
| 15 | -# due to some command line argument manipulation performed automatically | |
| 16 | -# by the shell. | |
| 17 | -# | |
| 18 | -# | |
| 19 | -OBJDIR = bld | |
| 20 | - | |
| 21 | -#### C Compiler and options for use in building executables that | |
| 22 | -# will run on the platform that is doing the build. This is used | |
| 23 | -# to compile code-generator programs as part of the build process. | |
| 24 | -# See TCC below for the C compiler for building the finished binary. | |
| 25 | -# | |
| 26 | -BCC = @CC_FOR_BUILD@ | |
| 27 | - | |
| 28 | -#### The suffix to add to final executable file. When cross-compiling | |
| 29 | -# to windows, make this ".exe". Otherwise leave it blank. | |
| 30 | -# | |
| 31 | -E = @EXEEXT@ | |
| 32 | - | |
| 33 | -TCC = @CC@ | |
| 34 | - | |
| 35 | -#### Tcl shell for use in running the fossil testsuite. If you do not | |
| 36 | -# care about testing the end result, this can be blank. | |
| 37 | -# | |
| 38 | -TCLSH = tclsh | |
| 39 | - | |
| 40 | -LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ | |
| 41 | -TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @ | |
| 42 | -INSTALLDIR =$(DESTDIR)@prefix@/bin | |
| 43 | -USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| --- a/Makefile.Cygwin.in | |
| +++ b/Makefile.Cygwin.in | |
| @@ -1,43 +0,0 @@ | |
| 1 | #!/usr/bin/make |
| 2 | # |
| 3 | # This is the top-level makefile for Fossil when the build is occurring |
| 4 | # on the Cygwin platform. |
| 5 | # |
| 6 | #### The toplevel directory of the source tree. Fossil can be built |
| 7 | # in a directory that is separate from the source tree. Just change |
| 8 | # the following to point from the build directory to the src/ folder. |
| 9 | # |
| 10 | SRCDIR = @srcdir@/src |
| 11 | |
| 12 | #### The directory into which object code files should be written. |
| 13 | # Having a "./" prefix in the value of this variable breaks our use of the |
| 14 | # "makeheaders" tool when running make on the MinGW platform, apparently |
| 15 | # due to some command line argument manipulation performed automatically |
| 16 | # by the shell. |
| 17 | # |
| 18 | # |
| 19 | OBJDIR = bld |
| 20 | |
| 21 | #### C Compiler and options for use in building executables that |
| 22 | # will run on the platform that is doing the build. This is used |
| 23 | # to compile code-generator programs as part of the build process. |
| 24 | # See TCC below for the C compiler for building the finished binary. |
| 25 | # |
| 26 | BCC = @CC_FOR_BUILD@ |
| 27 | |
| 28 | #### The suffix to add to final executable file. When cross-compiling |
| 29 | # to windows, make this ".exe". Otherwise leave it blank. |
| 30 | # |
| 31 | E = @EXEEXT@ |
| 32 | |
| 33 | TCC = @CC@ |
| 34 | |
| 35 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 36 | # care about testing the end result, this can be blank. |
| 37 | # |
| 38 | TCLSH = tclsh |
| 39 | |
| 40 | LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@ |
| 41 | TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @ |
| 42 | INSTALLDIR =$(DESTDIR)@prefix@/bin |
| 43 | USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@ |
| --- a/Makefile.Cygwin.in | |
| +++ b/Makefile.Cygwin.in | |
| @@ -1,43 +0,0 @@ | |
M
auto.def
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -262,7 +262,6 @@ | ||
| 262 | 262 | cc-check-function-in-lib getpass bsd |
| 263 | 263 | } |
| 264 | 264 | cc-check-function-in-lib dlopen dl |
| 265 | 265 | |
| 266 | 266 | make-template Makefile.in |
| 267 | -make-template Makefile.Cygwin.in | |
| 268 | 267 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 269 | 268 |
| --- auto.def | |
| +++ auto.def | |
| @@ -262,7 +262,6 @@ | |
| 262 | cc-check-function-in-lib getpass bsd |
| 263 | } |
| 264 | cc-check-function-in-lib dlopen dl |
| 265 | |
| 266 | make-template Makefile.in |
| 267 | make-template Makefile.Cygwin.in |
| 268 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 269 |
| --- auto.def | |
| +++ auto.def | |
| @@ -262,7 +262,6 @@ | |
| 262 | cc-check-function-in-lib getpass bsd |
| 263 | } |
| 264 | cc-check-function-in-lib dlopen dl |
| 265 | |
| 266 | make-template Makefile.in |
| 267 | make-config-header autoconfig.h -auto {USE_* FOSSIL_*} |
| 268 |
+5
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -117,10 +117,15 @@ | ||
| 117 | 117 | <li><p><i>MSVC</i> → Use the msc makefile. First |
| 118 | 118 | change to the "win/" subdirectory ("<b>cd win</b>") then run |
| 119 | 119 | "<b>nmake /f Makefile.msc</b>". Alternatively, the batch file |
| 120 | 120 | "<b>win\buildmsvc.bat</b>" may be used and it will attempt to |
| 121 | 121 | detect and use the latest installed version of MSVC. |
| 122 | + | |
| 123 | +<li><p><i>Cygwin</i> → The same as other unix-like systems. It is | |
| 124 | +recommended to configure using: "<b>configure --disable-internal-sqlite</b>", | |
| 125 | +making sure you have the "libsqlite3-devel" , "zlib-devel" and | |
| 126 | +"openssl-devel" packages installed first. | |
| 122 | 127 | </ol> |
| 123 | 128 | </ol> |
| 124 | 129 | |
| 125 | 130 | <h2>3.0 Installing</h2> |
| 126 | 131 | |
| 127 | 132 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -117,10 +117,15 @@ | |
| 117 | <li><p><i>MSVC</i> → Use the msc makefile. First |
| 118 | change to the "win/" subdirectory ("<b>cd win</b>") then run |
| 119 | "<b>nmake /f Makefile.msc</b>". Alternatively, the batch file |
| 120 | "<b>win\buildmsvc.bat</b>" may be used and it will attempt to |
| 121 | detect and use the latest installed version of MSVC. |
| 122 | </ol> |
| 123 | </ol> |
| 124 | |
| 125 | <h2>3.0 Installing</h2> |
| 126 | |
| 127 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -117,10 +117,15 @@ | |
| 117 | <li><p><i>MSVC</i> → Use the msc makefile. First |
| 118 | change to the "win/" subdirectory ("<b>cd win</b>") then run |
| 119 | "<b>nmake /f Makefile.msc</b>". Alternatively, the batch file |
| 120 | "<b>win\buildmsvc.bat</b>" may be used and it will attempt to |
| 121 | detect and use the latest installed version of MSVC. |
| 122 | |
| 123 | <li><p><i>Cygwin</i> → The same as other unix-like systems. It is |
| 124 | recommended to configure using: "<b>configure --disable-internal-sqlite</b>", |
| 125 | making sure you have the "libsqlite3-devel" , "zlib-devel" and |
| 126 | "openssl-devel" packages installed first. |
| 127 | </ol> |
| 128 | </ol> |
| 129 | |
| 130 | <h2>3.0 Installing</h2> |
| 131 | |
| 132 |