Fossil SCM
Correct typo in auto.def. Improvements to the Tcl integration.
Commit
6e08e5ae64e008576a7504955cc36064cbe851a2
Parent
0a94396ddfd9019…
6 files changed
+6
+6
+6
+6
+6
+6
+6
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -457,12 +457,14 @@ | ||
| 457 | 457 | # |
| 458 | 458 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 459 | 459 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 460 | 460 | LIBTCL = -ltclstub86 |
| 461 | 461 | endif |
| 462 | +TCLTARGET = libtclstub86.a | |
| 462 | 463 | else |
| 463 | 464 | LIBTCL = -ltcl86 |
| 465 | +TCLTARGET = binaries | |
| 464 | 466 | endif |
| 465 | 467 | |
| 466 | 468 | #### C Compile and options for use in building executables that |
| 467 | 469 | # will run on the target platform. This is usually the same |
| 468 | 470 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -705,10 +707,14 @@ | ||
| 705 | 707 | |
| 706 | 708 | openssl: zlib |
| 707 | 709 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 708 | 710 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 709 | 711 | |
| 712 | +tcl: | |
| 713 | + cd $(TCLSRCDIR)/win;./configure | |
| 714 | + $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) | |
| 715 | + | |
| 710 | 716 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 711 | 717 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 712 | 718 | |
| 713 | 719 | # This rule prevents make from using its default rules to try build |
| 714 | 720 | # an executable named "manifest" out of the file named "manifest.c" |
| 715 | 721 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -457,12 +457,14 @@ | |
| 457 | # |
| 458 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 459 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 460 | LIBTCL = -ltclstub86 |
| 461 | endif |
| 462 | else |
| 463 | LIBTCL = -ltcl86 |
| 464 | endif |
| 465 | |
| 466 | #### C Compile and options for use in building executables that |
| 467 | # will run on the target platform. This is usually the same |
| 468 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -705,10 +707,14 @@ | |
| 705 | |
| 706 | openssl: zlib |
| 707 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 708 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 709 | |
| 710 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 711 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 712 | |
| 713 | # This rule prevents make from using its default rules to try build |
| 714 | # an executable named "manifest" out of the file named "manifest.c" |
| 715 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -457,12 +457,14 @@ | |
| 457 | # |
| 458 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 459 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 460 | LIBTCL = -ltclstub86 |
| 461 | endif |
| 462 | TCLTARGET = libtclstub86.a |
| 463 | else |
| 464 | LIBTCL = -ltcl86 |
| 465 | TCLTARGET = binaries |
| 466 | endif |
| 467 | |
| 468 | #### C Compile and options for use in building executables that |
| 469 | # will run on the target platform. This is usually the same |
| 470 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -705,10 +707,14 @@ | |
| 707 | |
| 708 | openssl: zlib |
| 709 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 710 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 711 | |
| 712 | tcl: |
| 713 | cd $(TCLSRCDIR)/win;./configure |
| 714 | $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) |
| 715 | |
| 716 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 717 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 718 | |
| 719 | # This rule prevents make from using its default rules to try build |
| 720 | # an executable named "manifest" out of the file named "manifest.c" |
| 721 |
+6
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -457,12 +457,14 @@ | ||
| 457 | 457 | # |
| 458 | 458 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 459 | 459 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 460 | 460 | LIBTCL = -ltclstub86 |
| 461 | 461 | endif |
| 462 | +TCLTARGET = libtclstub86.a | |
| 462 | 463 | else |
| 463 | 464 | LIBTCL = -ltcl86 |
| 465 | +TCLTARGET = binaries | |
| 464 | 466 | endif |
| 465 | 467 | |
| 466 | 468 | #### C Compile and options for use in building executables that |
| 467 | 469 | # will run on the target platform. This is usually the same |
| 468 | 470 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -705,10 +707,14 @@ | ||
| 705 | 707 | |
| 706 | 708 | openssl: zlib |
| 707 | 709 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 708 | 710 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 709 | 711 | |
| 712 | +tcl: | |
| 713 | + cd $(TCLSRCDIR)/win;./configure | |
| 714 | + $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) | |
| 715 | + | |
| 710 | 716 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 711 | 717 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 712 | 718 | |
| 713 | 719 | # This rule prevents make from using its default rules to try build |
| 714 | 720 | # an executable named "manifest" out of the file named "manifest.c" |
| 715 | 721 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -457,12 +457,14 @@ | |
| 457 | # |
| 458 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 459 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 460 | LIBTCL = -ltclstub86 |
| 461 | endif |
| 462 | else |
| 463 | LIBTCL = -ltcl86 |
| 464 | endif |
| 465 | |
| 466 | #### C Compile and options for use in building executables that |
| 467 | # will run on the target platform. This is usually the same |
| 468 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -705,10 +707,14 @@ | |
| 705 | |
| 706 | openssl: zlib |
| 707 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 708 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 709 | |
| 710 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 711 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 712 | |
| 713 | # This rule prevents make from using its default rules to try build |
| 714 | # an executable named "manifest" out of the file named "manifest.c" |
| 715 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -457,12 +457,14 @@ | |
| 457 | # |
| 458 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 459 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 460 | LIBTCL = -ltclstub86 |
| 461 | endif |
| 462 | TCLTARGET = libtclstub86.a |
| 463 | else |
| 464 | LIBTCL = -ltcl86 |
| 465 | TCLTARGET = binaries |
| 466 | endif |
| 467 | |
| 468 | #### C Compile and options for use in building executables that |
| 469 | # will run on the target platform. This is usually the same |
| 470 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -705,10 +707,14 @@ | |
| 707 | |
| 708 | openssl: zlib |
| 709 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 710 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 711 | |
| 712 | tcl: |
| 713 | cd $(TCLSRCDIR)/win;./configure |
| 714 | $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) |
| 715 | |
| 716 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 717 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 718 | |
| 719 | # This rule prevents make from using its default rules to try build |
| 720 | # an executable named "manifest" out of the file named "manifest.c" |
| 721 |
+6
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -118,12 +118,14 @@ | ||
| 118 | 118 | # |
| 119 | 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | 121 | LIBTCL = -ltclstub86 |
| 122 | 122 | endif |
| 123 | +TCLTARGET = libtclstub86.a | |
| 123 | 124 | else |
| 124 | 125 | LIBTCL = -ltcl86 |
| 126 | +TCLTARGET = binaries | |
| 125 | 127 | endif |
| 126 | 128 | |
| 127 | 129 | #### C Compile and options for use in building executables that |
| 128 | 130 | # will run on the target platform. This is usually the same |
| 129 | 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | ||
| 672 | 674 | |
| 673 | 675 | openssl: zlib |
| 674 | 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | 678 | |
| 679 | +tcl: | |
| 680 | + cd $(TCLSRCDIR)/win;./configure | |
| 681 | + $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) | |
| 682 | + | |
| 677 | 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | 685 | |
| 680 | 686 | # This rule prevents make from using its default rules to try build |
| 681 | 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 | 688 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | else |
| 124 | LIBTCL = -ltcl86 |
| 125 | endif |
| 126 | |
| 127 | #### C Compile and options for use in building executables that |
| 128 | # will run on the target platform. This is usually the same |
| 129 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 672 | |
| 673 | openssl: zlib |
| 674 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | |
| 677 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | |
| 680 | # This rule prevents make from using its default rules to try build |
| 681 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | TCLTARGET = libtclstub86.a |
| 124 | else |
| 125 | LIBTCL = -ltcl86 |
| 126 | TCLTARGET = binaries |
| 127 | endif |
| 128 | |
| 129 | #### C Compile and options for use in building executables that |
| 130 | # will run on the target platform. This is usually the same |
| 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 674 | |
| 675 | openssl: zlib |
| 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 678 | |
| 679 | tcl: |
| 680 | cd $(TCLSRCDIR)/win;./configure |
| 681 | $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) |
| 682 | |
| 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 685 | |
| 686 | # This rule prevents make from using its default rules to try build |
| 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 688 |
+6
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -118,12 +118,14 @@ | ||
| 118 | 118 | # |
| 119 | 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | 121 | LIBTCL = -ltclstub86 |
| 122 | 122 | endif |
| 123 | +TCLTARGET = libtclstub86.a | |
| 123 | 124 | else |
| 124 | 125 | LIBTCL = -ltcl86 |
| 126 | +TCLTARGET = binaries | |
| 125 | 127 | endif |
| 126 | 128 | |
| 127 | 129 | #### C Compile and options for use in building executables that |
| 128 | 130 | # will run on the target platform. This is usually the same |
| 129 | 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | ||
| 672 | 674 | |
| 673 | 675 | openssl: zlib |
| 674 | 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | 678 | |
| 679 | +tcl: | |
| 680 | + cd $(TCLSRCDIR)/win;./configure | |
| 681 | + $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) | |
| 682 | + | |
| 677 | 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | 685 | |
| 680 | 686 | # This rule prevents make from using its default rules to try build |
| 681 | 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 | 688 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | else |
| 124 | LIBTCL = -ltcl86 |
| 125 | endif |
| 126 | |
| 127 | #### C Compile and options for use in building executables that |
| 128 | # will run on the target platform. This is usually the same |
| 129 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 672 | |
| 673 | openssl: zlib |
| 674 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | |
| 677 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | |
| 680 | # This rule prevents make from using its default rules to try build |
| 681 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | TCLTARGET = libtclstub86.a |
| 124 | else |
| 125 | LIBTCL = -ltcl86 |
| 126 | TCLTARGET = binaries |
| 127 | endif |
| 128 | |
| 129 | #### C Compile and options for use in building executables that |
| 130 | # will run on the target platform. This is usually the same |
| 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 674 | |
| 675 | openssl: zlib |
| 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 678 | |
| 679 | tcl: |
| 680 | cd $(TCLSRCDIR)/win;./configure |
| 681 | $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) |
| 682 | |
| 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 685 | |
| 686 | # This rule prevents make from using its default rules to try build |
| 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 688 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -118,12 +118,14 @@ | ||
| 118 | 118 | # |
| 119 | 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | 121 | LIBTCL = -ltclstub86 |
| 122 | 122 | endif |
| 123 | +TCLTARGET = libtclstub86.a | |
| 123 | 124 | else |
| 124 | 125 | LIBTCL = -ltcl86 |
| 126 | +TCLTARGET = binaries | |
| 125 | 127 | endif |
| 126 | 128 | |
| 127 | 129 | #### C Compile and options for use in building executables that |
| 128 | 130 | # will run on the target platform. This is usually the same |
| 129 | 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | ||
| 672 | 674 | |
| 673 | 675 | openssl: zlib |
| 674 | 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | 678 | |
| 679 | +tcl: | |
| 680 | + cd $(TCLSRCDIR)/win;./configure | |
| 681 | + $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) | |
| 682 | + | |
| 677 | 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | 685 | |
| 680 | 686 | # This rule prevents make from using its default rules to try build |
| 681 | 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 | 688 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | else |
| 124 | LIBTCL = -ltcl86 |
| 125 | endif |
| 126 | |
| 127 | #### C Compile and options for use in building executables that |
| 128 | # will run on the target platform. This is usually the same |
| 129 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 672 | |
| 673 | openssl: zlib |
| 674 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | |
| 677 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | |
| 680 | # This rule prevents make from using its default rules to try build |
| 681 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | TCLTARGET = libtclstub86.a |
| 124 | else |
| 125 | LIBTCL = -ltcl86 |
| 126 | TCLTARGET = binaries |
| 127 | endif |
| 128 | |
| 129 | #### C Compile and options for use in building executables that |
| 130 | # will run on the target platform. This is usually the same |
| 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 674 | |
| 675 | openssl: zlib |
| 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 678 | |
| 679 | tcl: |
| 680 | cd $(TCLSRCDIR)/win;./configure |
| 681 | $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) |
| 682 | |
| 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 685 | |
| 686 | # This rule prevents make from using its default rules to try build |
| 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 688 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -118,12 +118,14 @@ | ||
| 118 | 118 | # |
| 119 | 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | 121 | LIBTCL = -ltclstub86 |
| 122 | 122 | endif |
| 123 | +TCLTARGET = libtclstub86.a | |
| 123 | 124 | else |
| 124 | 125 | LIBTCL = -ltcl86 |
| 126 | +TCLTARGET = binaries | |
| 125 | 127 | endif |
| 126 | 128 | |
| 127 | 129 | #### C Compile and options for use in building executables that |
| 128 | 130 | # will run on the target platform. This is usually the same |
| 129 | 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | ||
| 672 | 674 | |
| 673 | 675 | openssl: zlib |
| 674 | 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | 678 | |
| 679 | +tcl: | |
| 680 | + cd $(TCLSRCDIR)/win;./configure | |
| 681 | + $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) | |
| 682 | + | |
| 677 | 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | 685 | |
| 680 | 686 | # This rule prevents make from using its default rules to try build |
| 681 | 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 | 688 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | else |
| 124 | LIBTCL = -ltcl86 |
| 125 | endif |
| 126 | |
| 127 | #### C Compile and options for use in building executables that |
| 128 | # will run on the target platform. This is usually the same |
| 129 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 672 | |
| 673 | openssl: zlib |
| 674 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 675 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 676 | |
| 677 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 678 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 679 | |
| 680 | # This rule prevents make from using its default rules to try build |
| 681 | # an executable named "manifest" out of the file named "manifest.c" |
| 682 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -118,12 +118,14 @@ | |
| 118 | # |
| 119 | ifdef FOSSIL_ENABLE_TCL_STUBS |
| 120 | ifndef FOSSIL_ENABLE_TCL_PRIVATE_STUBS |
| 121 | LIBTCL = -ltclstub86 |
| 122 | endif |
| 123 | TCLTARGET = libtclstub86.a |
| 124 | else |
| 125 | LIBTCL = -ltcl86 |
| 126 | TCLTARGET = binaries |
| 127 | endif |
| 128 | |
| 129 | #### C Compile and options for use in building executables that |
| 130 | # will run on the target platform. This is usually the same |
| 131 | # as BCC, unless you are cross-compiling. This C compiler builds |
| @@ -672,10 +674,14 @@ | |
| 674 | |
| 675 | openssl: zlib |
| 676 | cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw |
| 677 | $(MAKE) -C $(OPENSSLLIBDIR) build_libs |
| 678 | |
| 679 | tcl: |
| 680 | cd $(TCLSRCDIR)/win;./configure |
| 681 | $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET) |
| 682 | |
| 683 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib |
| 684 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 685 | |
| 686 | # This rule prevents make from using its default rules to try build |
| 687 | # an executable named "manifest" out of the file named "manifest.c" |
| 688 |