Fossil SCM

Modify the MinGW makefile to support building with zlib in the compat directory.

mistachkin 2012-11-27 07:03 UTC zlib
Commit 36734cfcf7a4bc833ef352721da62122a9e85980
Parent d17f4473cfe39df…
3 files changed +6 -6 +6 -6 +6 -6
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+6 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -391,16 +391,13 @@
391391
 # This is useful when Tcl has been compiled statically with MinGW.
392392
 #
393393
 FOSSIL_TCL_SOURCE = 1
394394
395395
 #### The directories where the zlib include and library files are located.
396
-# The recommended usage here is to use the Sysinternals junction tool
397
-# to create a hard link between an "zlib-1.x.y" sub-directory of the
398
-# Fossil source code directory and the target zlib source directory.
399396
 #
400
-ZINCDIR = $(SRCDIR)/../zlib-1.2.7
401
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.7
397
+ZINCDIR = $(SRCDIR)/../compat/zlib
398
+ZLIBDIR = $(SRCDIR)/../compat/zlib
402399
403400
 #### The directories where the OpenSSL include and library files are located.
404401
 # The recommended usage here is to use the Sysinternals junction tool
405402
 # to create a hard link between an "openssl-1.x" sub-directory of the
406403
 # Fossil source code directory and the target OpenSSL source directory.
@@ -661,11 +658,14 @@
661658
662659
 ifdef FOSSIL_ENABLE_TCL
663660
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
664661
 endif
665662
666
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
663
+zlib:
664
+ make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a
665
+
666
+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
667667
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
668668
669669
 # This rule prevents make from using its default rules to try build
670670
 # an executable named "manifest" out of the file named "manifest.c"
671671
 #
672672
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -391,16 +391,13 @@
391 # This is useful when Tcl has been compiled statically with MinGW.
392 #
393 FOSSIL_TCL_SOURCE = 1
394
395 #### The directories where the zlib include and library files are located.
396 # The recommended usage here is to use the Sysinternals junction tool
397 # to create a hard link between an "zlib-1.x.y" sub-directory of the
398 # Fossil source code directory and the target zlib source directory.
399 #
400 ZINCDIR = $(SRCDIR)/../zlib-1.2.7
401 ZLIBDIR = $(SRCDIR)/../zlib-1.2.7
402
403 #### The directories where the OpenSSL include and library files are located.
404 # The recommended usage here is to use the Sysinternals junction tool
405 # to create a hard link between an "openssl-1.x" sub-directory of the
406 # Fossil source code directory and the target OpenSSL source directory.
@@ -661,11 +658,14 @@
661
662 ifdef FOSSIL_ENABLE_TCL
663 EXTRAOBJ += $(OBJDIR)/th_tcl.o
664 endif
665
666 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
 
 
 
667 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
668
669 # This rule prevents make from using its default rules to try build
670 # an executable named "manifest" out of the file named "manifest.c"
671 #
672
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -391,16 +391,13 @@
391 # This is useful when Tcl has been compiled statically with MinGW.
392 #
393 FOSSIL_TCL_SOURCE = 1
394
395 #### The directories where the zlib include and library files are located.
 
 
 
396 #
397 ZINCDIR = $(SRCDIR)/../compat/zlib
398 ZLIBDIR = $(SRCDIR)/../compat/zlib
399
400 #### The directories where the OpenSSL include and library files are located.
401 # The recommended usage here is to use the Sysinternals junction tool
402 # to create a hard link between an "openssl-1.x" sub-directory of the
403 # Fossil source code directory and the target OpenSSL source directory.
@@ -661,11 +658,14 @@
658
659 ifdef FOSSIL_ENABLE_TCL
660 EXTRAOBJ += $(OBJDIR)/th_tcl.o
661 endif
662
663 zlib:
664 make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a
665
666 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
667 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
668
669 # This rule prevents make from using its default rules to try build
670 # an executable named "manifest" out of the file named "manifest.c"
671 #
672
M win/Makefile.mingw
+6 -6
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -62,16 +62,13 @@
6262
 # This is useful when Tcl has been compiled statically with MinGW.
6363
 #
6464
 FOSSIL_TCL_SOURCE = 1
6565
6666
 #### The directories where the zlib include and library files are located.
67
-# The recommended usage here is to use the Sysinternals junction tool
68
-# to create a hard link between an "zlib-1.x.y" sub-directory of the
69
-# Fossil source code directory and the target zlib source directory.
7067
 #
71
-ZINCDIR = $(SRCDIR)/../zlib-1.2.7
72
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.7
68
+ZINCDIR = $(SRCDIR)/../compat/zlib
69
+ZLIBDIR = $(SRCDIR)/../compat/zlib
7370
7471
 #### The directories where the OpenSSL include and library files are located.
7572
 # The recommended usage here is to use the Sysinternals junction tool
7673
 # to create a hard link between an "openssl-1.x" sub-directory of the
7774
 # Fossil source code directory and the target OpenSSL source directory.
@@ -614,11 +611,14 @@
614611
615612
 ifdef FOSSIL_ENABLE_TCL
616613
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
617614
 endif
618615
619
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
616
+zlib:
617
+ make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a
618
+
619
+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
620620
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
621621
622622
 # This rule prevents make from using its default rules to try build
623623
 # an executable named "manifest" out of the file named "manifest.c"
624624
 #
625625
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -62,16 +62,13 @@
62 # This is useful when Tcl has been compiled statically with MinGW.
63 #
64 FOSSIL_TCL_SOURCE = 1
65
66 #### The directories where the zlib include and library files are located.
67 # The recommended usage here is to use the Sysinternals junction tool
68 # to create a hard link between an "zlib-1.x.y" sub-directory of the
69 # Fossil source code directory and the target zlib source directory.
70 #
71 ZINCDIR = $(SRCDIR)/../zlib-1.2.7
72 ZLIBDIR = $(SRCDIR)/../zlib-1.2.7
73
74 #### The directories where the OpenSSL include and library files are located.
75 # The recommended usage here is to use the Sysinternals junction tool
76 # to create a hard link between an "openssl-1.x" sub-directory of the
77 # Fossil source code directory and the target OpenSSL source directory.
@@ -614,11 +611,14 @@
614
615 ifdef FOSSIL_ENABLE_TCL
616 EXTRAOBJ += $(OBJDIR)/th_tcl.o
617 endif
618
619 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
 
 
 
620 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
621
622 # This rule prevents make from using its default rules to try build
623 # an executable named "manifest" out of the file named "manifest.c"
624 #
625
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -62,16 +62,13 @@
62 # This is useful when Tcl has been compiled statically with MinGW.
63 #
64 FOSSIL_TCL_SOURCE = 1
65
66 #### The directories where the zlib include and library files are located.
 
 
 
67 #
68 ZINCDIR = $(SRCDIR)/../compat/zlib
69 ZLIBDIR = $(SRCDIR)/../compat/zlib
70
71 #### The directories where the OpenSSL include and library files are located.
72 # The recommended usage here is to use the Sysinternals junction tool
73 # to create a hard link between an "openssl-1.x" sub-directory of the
74 # Fossil source code directory and the target OpenSSL source directory.
@@ -614,11 +611,14 @@
611
612 ifdef FOSSIL_ENABLE_TCL
613 EXTRAOBJ += $(OBJDIR)/th_tcl.o
614 endif
615
616 zlib:
617 make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a
618
619 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
620 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
621
622 # This rule prevents make from using its default rules to try build
623 # an executable named "manifest" out of the file named "manifest.c"
624 #
625
M win/Makefile.mingw.mistachkin
+6 -6
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -62,16 +62,13 @@
6262
 # This is useful when Tcl has been compiled statically with MinGW.
6363
 #
6464
 FOSSIL_TCL_SOURCE = 1
6565
6666
 #### The directories where the zlib include and library files are located.
67
-# The recommended usage here is to use the Sysinternals junction tool
68
-# to create a hard link between an "zlib-1.x.y" sub-directory of the
69
-# Fossil source code directory and the target zlib source directory.
7067
 #
71
-ZINCDIR = $(SRCDIR)/../zlib-1.2.7
72
-ZLIBDIR = $(SRCDIR)/../zlib-1.2.7
68
+ZINCDIR = $(SRCDIR)/../compat/zlib
69
+ZLIBDIR = $(SRCDIR)/../compat/zlib
7370
7471
 #### The directories where the OpenSSL include and library files are located.
7572
 # The recommended usage here is to use the Sysinternals junction tool
7673
 # to create a hard link between an "openssl-1.x" sub-directory of the
7774
 # Fossil source code directory and the target OpenSSL source directory.
@@ -614,11 +611,14 @@
614611
615612
 ifdef FOSSIL_ENABLE_TCL
616613
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
617614
 endif
618615
619
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
616
+zlib:
617
+ make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a
618
+
619
+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
620620
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
621621
622622
 # This rule prevents make from using its default rules to try build
623623
 # an executable named "manifest" out of the file named "manifest.c"
624624
 #
625625
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -62,16 +62,13 @@
62 # This is useful when Tcl has been compiled statically with MinGW.
63 #
64 FOSSIL_TCL_SOURCE = 1
65
66 #### The directories where the zlib include and library files are located.
67 # The recommended usage here is to use the Sysinternals junction tool
68 # to create a hard link between an "zlib-1.x.y" sub-directory of the
69 # Fossil source code directory and the target zlib source directory.
70 #
71 ZINCDIR = $(SRCDIR)/../zlib-1.2.7
72 ZLIBDIR = $(SRCDIR)/../zlib-1.2.7
73
74 #### The directories where the OpenSSL include and library files are located.
75 # The recommended usage here is to use the Sysinternals junction tool
76 # to create a hard link between an "openssl-1.x" sub-directory of the
77 # Fossil source code directory and the target OpenSSL source directory.
@@ -614,11 +611,14 @@
614
615 ifdef FOSSIL_ENABLE_TCL
616 EXTRAOBJ += $(OBJDIR)/th_tcl.o
617 endif
618
619 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o
 
 
 
620 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
621
622 # This rule prevents make from using its default rules to try build
623 # an executable named "manifest" out of the file named "manifest.c"
624 #
625
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -62,16 +62,13 @@
62 # This is useful when Tcl has been compiled statically with MinGW.
63 #
64 FOSSIL_TCL_SOURCE = 1
65
66 #### The directories where the zlib include and library files are located.
 
 
 
67 #
68 ZINCDIR = $(SRCDIR)/../compat/zlib
69 ZLIBDIR = $(SRCDIR)/../compat/zlib
70
71 #### The directories where the OpenSSL include and library files are located.
72 # The recommended usage here is to use the Sysinternals junction tool
73 # to create a hard link between an "openssl-1.x" sub-directory of the
74 # Fossil source code directory and the target OpenSSL source directory.
@@ -614,11 +611,14 @@
611
612 ifdef FOSSIL_ENABLE_TCL
613 EXTRAOBJ += $(OBJDIR)/th_tcl.o
614 endif
615
616 zlib:
617 make -C $(ZLIBDIR) -f win32/Makefile.gcc libz.a
618
619 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
620 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
621
622 # This rule prevents make from using its default rules to try build
623 # an executable named "manifest" out of the file named "manifest.c"
624 #
625

Keyboard Shortcuts

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