Fossil SCM

Add new tcl target to Makefile.mingw. Only build what is necessary for building Fossil.

jan.nijtmans 2013-09-16 07:24 trunk
Commit c237195fa4b9bf926a53b33548e32f061b6035fb
Parent 5d20065c4b9963c…
3 files changed +6 +6 +6
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -451,12 +451,14 @@
451451
452452
 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
453453
 #
454454
 ifdef FOSSIL_ENABLE_TCL_STUBS
455455
 LIBTCL = -ltclstub86
456
+TCLTARGET = libtclstub86.a
456457
 else
457458
 LIBTCL = -ltcl86
459
+TCLTARGET = binaries
458460
 endif
459461
460462
 #### C Compile and options for use in building executables that
461463
 # will run on the target platform. This is usually the same
462464
 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -695,10 +697,14 @@
695697
696698
 openssl: zlib
697699
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
698700
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
699701
702
+tcl:
703
+ cd $(TCLSRCDIR)/win;./configure
704
+ $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
705
+
700706
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
701707
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
702708
703709
 # This rule prevents make from using its default rules to try build
704710
 # an executable named "manifest" out of the file named "manifest.c"
705711
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -451,12 +451,14 @@
451
452 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
453 #
454 ifdef FOSSIL_ENABLE_TCL_STUBS
455 LIBTCL = -ltclstub86
 
456 else
457 LIBTCL = -ltcl86
 
458 endif
459
460 #### C Compile and options for use in building executables that
461 # will run on the target platform. This is usually the same
462 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -695,10 +697,14 @@
695
696 openssl: zlib
697 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
698 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
699
 
 
 
 
700 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
701 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
702
703 # This rule prevents make from using its default rules to try build
704 # an executable named "manifest" out of the file named "manifest.c"
705
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -451,12 +451,14 @@
451
452 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
453 #
454 ifdef FOSSIL_ENABLE_TCL_STUBS
455 LIBTCL = -ltclstub86
456 TCLTARGET = libtclstub86.a
457 else
458 LIBTCL = -ltcl86
459 TCLTARGET = binaries
460 endif
461
462 #### C Compile and options for use in building executables that
463 # will run on the target platform. This is usually the same
464 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -695,10 +697,14 @@
697
698 openssl: zlib
699 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
700 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
701
702 tcl:
703 cd $(TCLSRCDIR)/win;./configure
704 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
705
706 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
707 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
708
709 # This rule prevents make from using its default rules to try build
710 # an executable named "manifest" out of the file named "manifest.c"
711
M win/Makefile.mingw
+6
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -112,12 +112,14 @@
112112
113113
 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
114114
 #
115115
 ifdef FOSSIL_ENABLE_TCL_STUBS
116116
 LIBTCL = -ltclstub86
117
+TCLTARGET = libtclstub86.a
117118
 else
118119
 LIBTCL = -ltcl86
120
+TCLTARGET = binaries
119121
 endif
120122
121123
 #### C Compile and options for use in building executables that
122124
 # will run on the target platform. This is usually the same
123125
 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -662,10 +664,14 @@
662664
663665
 openssl: zlib
664666
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665667
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
666668
669
+tcl:
670
+ cd $(TCLSRCDIR)/win;./configure
671
+ $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
672
+
667673
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668674
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669675
670676
 # This rule prevents make from using its default rules to try build
671677
 # an executable named "manifest" out of the file named "manifest.c"
672678
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -112,12 +112,14 @@
112
113 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
114 #
115 ifdef FOSSIL_ENABLE_TCL_STUBS
116 LIBTCL = -ltclstub86
 
117 else
118 LIBTCL = -ltcl86
 
119 endif
120
121 #### C Compile and options for use in building executables that
122 # will run on the target platform. This is usually the same
123 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -662,10 +664,14 @@
662
663 openssl: zlib
664 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
666
 
 
 
 
667 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669
670 # This rule prevents make from using its default rules to try build
671 # an executable named "manifest" out of the file named "manifest.c"
672
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -112,12 +112,14 @@
112
113 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
114 #
115 ifdef FOSSIL_ENABLE_TCL_STUBS
116 LIBTCL = -ltclstub86
117 TCLTARGET = libtclstub86.a
118 else
119 LIBTCL = -ltcl86
120 TCLTARGET = binaries
121 endif
122
123 #### C Compile and options for use in building executables that
124 # will run on the target platform. This is usually the same
125 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -662,10 +664,14 @@
664
665 openssl: zlib
666 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
667 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
668
669 tcl:
670 cd $(TCLSRCDIR)/win;./configure
671 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
672
673 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
674 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
675
676 # This rule prevents make from using its default rules to try build
677 # an executable named "manifest" out of the file named "manifest.c"
678
M win/Makefile.mingw.mistachkin
+6
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -112,12 +112,14 @@
112112
113113
 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
114114
 #
115115
 ifdef FOSSIL_ENABLE_TCL_STUBS
116116
 LIBTCL = -ltclstub86
117
+TCLTARGET = libtclstub86.a
117118
 else
118119
 LIBTCL = -ltcl86
120
+TCLTARGET = binaries
119121
 endif
120122
121123
 #### C Compile and options for use in building executables that
122124
 # will run on the target platform. This is usually the same
123125
 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -662,10 +664,14 @@
662664
663665
 openssl: zlib
664666
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665667
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
666668
669
+tcl:
670
+ cd $(TCLSRCDIR)/win;./configure
671
+ $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
672
+
667673
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668674
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669675
670676
 # This rule prevents make from using its default rules to try build
671677
 # an executable named "manifest" out of the file named "manifest.c"
672678
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -112,12 +112,14 @@
112
113 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
114 #
115 ifdef FOSSIL_ENABLE_TCL_STUBS
116 LIBTCL = -ltclstub86
 
117 else
118 LIBTCL = -ltcl86
 
119 endif
120
121 #### C Compile and options for use in building executables that
122 # will run on the target platform. This is usually the same
123 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -662,10 +664,14 @@
662
663 openssl: zlib
664 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
666
 
 
 
 
667 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669
670 # This rule prevents make from using its default rules to try build
671 # an executable named "manifest" out of the file named "manifest.c"
672
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -112,12 +112,14 @@
112
113 #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)?
114 #
115 ifdef FOSSIL_ENABLE_TCL_STUBS
116 LIBTCL = -ltclstub86
117 TCLTARGET = libtclstub86.a
118 else
119 LIBTCL = -ltcl86
120 TCLTARGET = binaries
121 endif
122
123 #### C Compile and options for use in building executables that
124 # will run on the target platform. This is usually the same
125 # as BCC, unless you are cross-compiling. This C compiler builds
@@ -662,10 +664,14 @@
664
665 openssl: zlib
666 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
667 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
668
669 tcl:
670 cd $(TCLSRCDIR)/win;./configure
671 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
672
673 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
674 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
675
676 # This rule prevents make from using its default rules to try build
677 # an executable named "manifest" out of the file named "manifest.c"
678

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button