Fossil SCM

Cleanup and unify the 'extra targets' handling.

mistachkin 2014-08-25 22:25 UTC optionalMiniz
Commit 6c6f83c4fd58a99efa39e182cb0993a3d631ae7c
Parent 5735181c4db4330…
4 files changed +18 -11 +12 -6 +12 -6 +6 -5
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+18 -11
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -713,11 +713,13 @@
713713
 writeln -nonewline "OBJ ="
714714
 foreach s [lsort $src] {
715715
 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
716716
 }
717717
 writeln "\n"
718
-writeln "APPNAME = ${name}.exe"
718
+writeln "APPNAME = ${name}.exe"
719
+writeln "APPTARGETS ="
720
+writeln "LIBTARGETS ="
719721
 writeln {
720722
 #### If the USE_WINDOWS variable exists, it is assumed that we are building
721723
 # inside of a Windows-style shell; otherwise, it is assumed that we are
722724
 # building inside of a Unix-style shell. Note that the "move" command is
723725
 # broken when attempting to use it from the Windows shell via MinGW make
@@ -836,17 +838,15 @@
836838
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
837839
838840
 clean-zlib:
839841
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
840842
841
-EXTRATARGET =
842
-
843843
 ifndef FOSSIL_ENABLE_MINIZ
844
-EXTRATARGET += zlib
844
+LIBTARGETS += zlib
845845
 endif
846846
847
-openssl: $(EXTRATARGET)
847
+openssl: $(LIBTARGETS)
848848
 ifndef FOSSIL_ENABLE_MINIZ
849849
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
850850
 else
851851
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
852852
 endif
@@ -860,11 +860,17 @@
860860
 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
861861
862862
 clean-tcl:
863863
 $(MAKE) -C $(TCLSRCDIR)/win distclean
864864
865
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(EXTRATARGET)
865
+APPTARGETS += $(LIBTARGETS)
866
+
867
+ifdef FOSSIL_ENABLE_SSL
868
+APPTARGETS += openssl
869
+endif
870
+
871
+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
866872
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
867873
868874
 # This rule prevents make from using its default rules to try build
869875
 # an executable named "manifest" out of the file named "manifest.c"
870876
 #
@@ -1279,12 +1285,13 @@
12791285
 writeln -nonewline " "
12801286
 writeln "\$(OX)\\miniz\$O \\"; incr i
12811287
 writeln "!endif"
12821288
 writeln -nonewline " \$(OX)\\fossil.res\n\n"
12831289
 writeln {
1284
-APPNAME = $(OX)\fossil$(E)
1285
-PDBNAME = $(OX)\fossil$(P)
1290
+APPNAME = $(OX)\fossil$(E)
1291
+PDBNAME = $(OX)\fossil$(P)
1292
+APPTARGETS =
12861293
12871294
 all: $(OX) $(APPNAME)
12881295
12891296
 zlib:
12901297
 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1300,18 +1307,18 @@
13001307
 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
13011308
 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
13021309
 !endif
13031310
13041311
 !ifndef FOSSIL_ENABLE_MINIZ
1305
-EXTRATARGETS = $(EXTRATARGETS) zlib
1312
+APPTARGETS = $(APPTARGETS) zlib
13061313
 !endif
13071314
13081315
 !ifdef FOSSIL_ENABLE_SSL
1309
-EXTRATARGETS = $(EXTRATARGETS) openssl
1316
+APPTARGETS = $(APPTARGETS) openssl
13101317
 !endif
13111318
1312
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1319
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
13131320
 cd $(OX)
13141321
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
13151322
13161323
 $(OX)\linkopts: $B\win\Makefile.msc}
13171324
 set redir {>}
13181325
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -713,11 +713,13 @@
713 writeln -nonewline "OBJ ="
714 foreach s [lsort $src] {
715 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
716 }
717 writeln "\n"
718 writeln "APPNAME = ${name}.exe"
 
 
719 writeln {
720 #### If the USE_WINDOWS variable exists, it is assumed that we are building
721 # inside of a Windows-style shell; otherwise, it is assumed that we are
722 # building inside of a Unix-style shell. Note that the "move" command is
723 # broken when attempting to use it from the Windows shell via MinGW make
@@ -836,17 +838,15 @@
836 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
837
838 clean-zlib:
839 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
840
841 EXTRATARGET =
842
843 ifndef FOSSIL_ENABLE_MINIZ
844 EXTRATARGET += zlib
845 endif
846
847 openssl: $(EXTRATARGET)
848 ifndef FOSSIL_ENABLE_MINIZ
849 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
850 else
851 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
852 endif
@@ -860,11 +860,17 @@
860 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
861
862 clean-tcl:
863 $(MAKE) -C $(TCLSRCDIR)/win distclean
864
865 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(EXTRATARGET)
 
 
 
 
 
 
866 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
867
868 # This rule prevents make from using its default rules to try build
869 # an executable named "manifest" out of the file named "manifest.c"
870 #
@@ -1279,12 +1285,13 @@
1279 writeln -nonewline " "
1280 writeln "\$(OX)\\miniz\$O \\"; incr i
1281 writeln "!endif"
1282 writeln -nonewline " \$(OX)\\fossil.res\n\n"
1283 writeln {
1284 APPNAME = $(OX)\fossil$(E)
1285 PDBNAME = $(OX)\fossil$(P)
 
1286
1287 all: $(OX) $(APPNAME)
1288
1289 zlib:
1290 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1300,18 +1307,18 @@
1300 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1301 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1302 !endif
1303
1304 !ifndef FOSSIL_ENABLE_MINIZ
1305 EXTRATARGETS = $(EXTRATARGETS) zlib
1306 !endif
1307
1308 !ifdef FOSSIL_ENABLE_SSL
1309 EXTRATARGETS = $(EXTRATARGETS) openssl
1310 !endif
1311
1312 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
1313 cd $(OX)
1314 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1315
1316 $(OX)\linkopts: $B\win\Makefile.msc}
1317 set redir {>}
1318
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -713,11 +713,13 @@
713 writeln -nonewline "OBJ ="
714 foreach s [lsort $src] {
715 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
716 }
717 writeln "\n"
718 writeln "APPNAME = ${name}.exe"
719 writeln "APPTARGETS ="
720 writeln "LIBTARGETS ="
721 writeln {
722 #### If the USE_WINDOWS variable exists, it is assumed that we are building
723 # inside of a Windows-style shell; otherwise, it is assumed that we are
724 # building inside of a Unix-style shell. Note that the "move" command is
725 # broken when attempting to use it from the Windows shell via MinGW make
@@ -836,17 +838,15 @@
838 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
839
840 clean-zlib:
841 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
842
 
 
843 ifndef FOSSIL_ENABLE_MINIZ
844 LIBTARGETS += zlib
845 endif
846
847 openssl: $(LIBTARGETS)
848 ifndef FOSSIL_ENABLE_MINIZ
849 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
850 else
851 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
852 endif
@@ -860,11 +860,17 @@
860 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
861
862 clean-tcl:
863 $(MAKE) -C $(TCLSRCDIR)/win distclean
864
865 APPTARGETS += $(LIBTARGETS)
866
867 ifdef FOSSIL_ENABLE_SSL
868 APPTARGETS += openssl
869 endif
870
871 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
872 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
873
874 # This rule prevents make from using its default rules to try build
875 # an executable named "manifest" out of the file named "manifest.c"
876 #
@@ -1279,12 +1285,13 @@
1285 writeln -nonewline " "
1286 writeln "\$(OX)\\miniz\$O \\"; incr i
1287 writeln "!endif"
1288 writeln -nonewline " \$(OX)\\fossil.res\n\n"
1289 writeln {
1290 APPNAME = $(OX)\fossil$(E)
1291 PDBNAME = $(OX)\fossil$(P)
1292 APPTARGETS =
1293
1294 all: $(OX) $(APPNAME)
1295
1296 zlib:
1297 @echo Building zlib from "$(ZLIBDIR)"...
@@ -1300,18 +1307,18 @@
1307 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
1308 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
1309 !endif
1310
1311 !ifndef FOSSIL_ENABLE_MINIZ
1312 APPTARGETS = $(APPTARGETS) zlib
1313 !endif
1314
1315 !ifdef FOSSIL_ENABLE_SSL
1316 APPTARGETS = $(APPTARGETS) openssl
1317 !endif
1318
1319 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
1320 cd $(OX)
1321 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
1322
1323 $(OX)\linkopts: $B\win\Makefile.msc}
1324 set redir {>}
1325
M win/Makefile.mingw
+12 -6
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -646,11 +646,13 @@
646646
 $(OBJDIR)/wysiwyg.o \
647647
 $(OBJDIR)/xfer.o \
648648
 $(OBJDIR)/xfersetup.o \
649649
 $(OBJDIR)/zip.o
650650
651
-APPNAME = fossil.exe
651
+APPNAME = fossil.exe
652
+APPTARGETS =
653
+LIBTARGETS =
652654
653655
 #### If the USE_WINDOWS variable exists, it is assumed that we are building
654656
 # inside of a Windows-style shell; otherwise, it is assumed that we are
655657
 # building inside of a Unix-style shell. Note that the "move" command is
656658
 # broken when attempting to use it from the Windows shell via MinGW make
@@ -766,17 +768,15 @@
766768
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
767769
768770
 clean-zlib:
769771
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
770772
771
-EXTRATARGET =
772
-
773773
 ifndef FOSSIL_ENABLE_MINIZ
774
-EXTRATARGET += zlib
774
+LIBTARGETS += zlib
775775
 endif
776776
777
-openssl: $(EXTRATARGET)
777
+openssl: $(LIBTARGETS)
778778
 ifndef FOSSIL_ENABLE_MINIZ
779779
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
780780
 else
781781
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
782782
 endif
@@ -790,11 +790,17 @@
790790
 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
791791
792792
 clean-tcl:
793793
 $(MAKE) -C $(TCLSRCDIR)/win distclean
794794
795
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(EXTRATARGET)
795
+APPTARGETS += $(LIBTARGETS)
796
+
797
+ifdef FOSSIL_ENABLE_SSL
798
+APPTARGETS += openssl
799
+endif
800
+
801
+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
796802
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
797803
798804
 # This rule prevents make from using its default rules to try build
799805
 # an executable named "manifest" out of the file named "manifest.c"
800806
 #
801807
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -646,11 +646,13 @@
646 $(OBJDIR)/wysiwyg.o \
647 $(OBJDIR)/xfer.o \
648 $(OBJDIR)/xfersetup.o \
649 $(OBJDIR)/zip.o
650
651 APPNAME = fossil.exe
 
 
652
653 #### If the USE_WINDOWS variable exists, it is assumed that we are building
654 # inside of a Windows-style shell; otherwise, it is assumed that we are
655 # building inside of a Unix-style shell. Note that the "move" command is
656 # broken when attempting to use it from the Windows shell via MinGW make
@@ -766,17 +768,15 @@
766 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
767
768 clean-zlib:
769 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
770
771 EXTRATARGET =
772
773 ifndef FOSSIL_ENABLE_MINIZ
774 EXTRATARGET += zlib
775 endif
776
777 openssl: $(EXTRATARGET)
778 ifndef FOSSIL_ENABLE_MINIZ
779 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
780 else
781 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
782 endif
@@ -790,11 +790,17 @@
790 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
791
792 clean-tcl:
793 $(MAKE) -C $(TCLSRCDIR)/win distclean
794
795 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(EXTRATARGET)
 
 
 
 
 
 
796 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
797
798 # This rule prevents make from using its default rules to try build
799 # an executable named "manifest" out of the file named "manifest.c"
800 #
801
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -646,11 +646,13 @@
646 $(OBJDIR)/wysiwyg.o \
647 $(OBJDIR)/xfer.o \
648 $(OBJDIR)/xfersetup.o \
649 $(OBJDIR)/zip.o
650
651 APPNAME = fossil.exe
652 APPTARGETS =
653 LIBTARGETS =
654
655 #### If the USE_WINDOWS variable exists, it is assumed that we are building
656 # inside of a Windows-style shell; otherwise, it is assumed that we are
657 # building inside of a Unix-style shell. Note that the "move" command is
658 # broken when attempting to use it from the Windows shell via MinGW make
@@ -766,17 +768,15 @@
768 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
769
770 clean-zlib:
771 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
772
 
 
773 ifndef FOSSIL_ENABLE_MINIZ
774 LIBTARGETS += zlib
775 endif
776
777 openssl: $(LIBTARGETS)
778 ifndef FOSSIL_ENABLE_MINIZ
779 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
780 else
781 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
782 endif
@@ -790,11 +790,17 @@
790 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
791
792 clean-tcl:
793 $(MAKE) -C $(TCLSRCDIR)/win distclean
794
795 APPTARGETS += $(LIBTARGETS)
796
797 ifdef FOSSIL_ENABLE_SSL
798 APPTARGETS += openssl
799 endif
800
801 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
802 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
803
804 # This rule prevents make from using its default rules to try build
805 # an executable named "manifest" out of the file named "manifest.c"
806 #
807
M win/Makefile.mingw.mistachkin
+12 -6
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -646,11 +646,13 @@
646646
 $(OBJDIR)/wysiwyg.o \
647647
 $(OBJDIR)/xfer.o \
648648
 $(OBJDIR)/xfersetup.o \
649649
 $(OBJDIR)/zip.o
650650
651
-APPNAME = fossil.exe
651
+APPNAME = fossil.exe
652
+APPTARGETS =
653
+LIBTARGETS =
652654
653655
 #### If the USE_WINDOWS variable exists, it is assumed that we are building
654656
 # inside of a Windows-style shell; otherwise, it is assumed that we are
655657
 # building inside of a Unix-style shell. Note that the "move" command is
656658
 # broken when attempting to use it from the Windows shell via MinGW make
@@ -766,17 +768,15 @@
766768
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
767769
768770
 clean-zlib:
769771
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
770772
771
-EXTRATARGET =
772
-
773773
 ifndef FOSSIL_ENABLE_MINIZ
774
-EXTRATARGET += zlib
774
+LIBTARGETS += zlib
775775
 endif
776776
777
-openssl: $(EXTRATARGET)
777
+openssl: $(LIBTARGETS)
778778
 ifndef FOSSIL_ENABLE_MINIZ
779779
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
780780
 else
781781
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
782782
 endif
@@ -790,11 +790,17 @@
790790
 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
791791
792792
 clean-tcl:
793793
 $(MAKE) -C $(TCLSRCDIR)/win distclean
794794
795
-$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(EXTRATARGET)
795
+APPTARGETS += $(LIBTARGETS)
796
+
797
+ifdef FOSSIL_ENABLE_SSL
798
+APPTARGETS += openssl
799
+endif
800
+
801
+$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
796802
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
797803
798804
 # This rule prevents make from using its default rules to try build
799805
 # an executable named "manifest" out of the file named "manifest.c"
800806
 #
801807
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -646,11 +646,13 @@
646 $(OBJDIR)/wysiwyg.o \
647 $(OBJDIR)/xfer.o \
648 $(OBJDIR)/xfersetup.o \
649 $(OBJDIR)/zip.o
650
651 APPNAME = fossil.exe
 
 
652
653 #### If the USE_WINDOWS variable exists, it is assumed that we are building
654 # inside of a Windows-style shell; otherwise, it is assumed that we are
655 # building inside of a Unix-style shell. Note that the "move" command is
656 # broken when attempting to use it from the Windows shell via MinGW make
@@ -766,17 +768,15 @@
766 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
767
768 clean-zlib:
769 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
770
771 EXTRATARGET =
772
773 ifndef FOSSIL_ENABLE_MINIZ
774 EXTRATARGET += zlib
775 endif
776
777 openssl: $(EXTRATARGET)
778 ifndef FOSSIL_ENABLE_MINIZ
779 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
780 else
781 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
782 endif
@@ -790,11 +790,17 @@
790 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
791
792 clean-tcl:
793 $(MAKE) -C $(TCLSRCDIR)/win distclean
794
795 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(EXTRATARGET)
 
 
 
 
 
 
796 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
797
798 # This rule prevents make from using its default rules to try build
799 # an executable named "manifest" out of the file named "manifest.c"
800 #
801
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -646,11 +646,13 @@
646 $(OBJDIR)/wysiwyg.o \
647 $(OBJDIR)/xfer.o \
648 $(OBJDIR)/xfersetup.o \
649 $(OBJDIR)/zip.o
650
651 APPNAME = fossil.exe
652 APPTARGETS =
653 LIBTARGETS =
654
655 #### If the USE_WINDOWS variable exists, it is assumed that we are building
656 # inside of a Windows-style shell; otherwise, it is assumed that we are
657 # building inside of a Unix-style shell. Note that the "move" command is
658 # broken when attempting to use it from the Windows shell via MinGW make
@@ -766,17 +768,15 @@
768 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
769
770 clean-zlib:
771 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
772
 
 
773 ifndef FOSSIL_ENABLE_MINIZ
774 LIBTARGETS += zlib
775 endif
776
777 openssl: $(LIBTARGETS)
778 ifndef FOSSIL_ENABLE_MINIZ
779 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
780 else
781 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) mingw
782 endif
@@ -790,11 +790,17 @@
790 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
791
792 clean-tcl:
793 $(MAKE) -C $(TCLSRCDIR)/win distclean
794
795 APPTARGETS += $(LIBTARGETS)
796
797 ifdef FOSSIL_ENABLE_SSL
798 APPTARGETS += openssl
799 endif
800
801 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS)
802 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
803
804 # This rule prevents make from using its default rules to try build
805 # an executable named "manifest" out of the file named "manifest.c"
806 #
807
M win/Makefile.msc
+6 -5
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -376,12 +376,13 @@
376376
 $(OX)\miniz$O \
377377
 !endif
378378
 $(OX)\fossil.res
379379
380380
381
-APPNAME = $(OX)\fossil$(E)
382
-PDBNAME = $(OX)\fossil$(P)
381
+APPNAME = $(OX)\fossil$(E)
382
+PDBNAME = $(OX)\fossil$(P)
383
+APPTARGETS =
383384
384385
 all: $(OX) $(APPNAME)
385386
386387
 zlib:
387388
 @echo Building zlib from "$(ZLIBDIR)"...
@@ -397,18 +398,18 @@
397398
 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398399
 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
399400
 !endif
400401
401402
 !ifndef FOSSIL_ENABLE_MINIZ
402
-EXTRATARGETS = $(EXTRATARGETS) zlib
403
+APPTARGETS = $(APPTARGETS) zlib
403404
 !endif
404405
405406
 !ifdef FOSSIL_ENABLE_SSL
406
-EXTRATARGETS = $(EXTRATARGETS) openssl
407
+APPTARGETS = $(APPTARGETS) openssl
407408
 !endif
408409
409
-$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
410
+$(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
410411
 cd $(OX)
411412
 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
412413
413414
 $(OX)\linkopts: $B\win\Makefile.msc
414415
 echo $(OX)\add.obj > $@
415416
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -376,12 +376,13 @@
376 $(OX)\miniz$O \
377 !endif
378 $(OX)\fossil.res
379
380
381 APPNAME = $(OX)\fossil$(E)
382 PDBNAME = $(OX)\fossil$(P)
 
383
384 all: $(OX) $(APPNAME)
385
386 zlib:
387 @echo Building zlib from "$(ZLIBDIR)"...
@@ -397,18 +398,18 @@
397 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
398 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
399 !endif
400
401 !ifndef FOSSIL_ENABLE_MINIZ
402 EXTRATARGETS = $(EXTRATARGETS) zlib
403 !endif
404
405 !ifdef FOSSIL_ENABLE_SSL
406 EXTRATARGETS = $(EXTRATARGETS) openssl
407 !endif
408
409 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(EXTRATARGETS)
410 cd $(OX)
411 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
412
413 $(OX)\linkopts: $B\win\Makefile.msc
414 echo $(OX)\add.obj > $@
415
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -376,12 +376,13 @@
376 $(OX)\miniz$O \
377 !endif
378 $(OX)\fossil.res
379
380
381 APPNAME = $(OX)\fossil$(E)
382 PDBNAME = $(OX)\fossil$(P)
383 APPTARGETS =
384
385 all: $(OX) $(APPNAME)
386
387 zlib:
388 @echo Building zlib from "$(ZLIBDIR)"...
@@ -397,18 +398,18 @@
398 @pushd "$(SSLDIR)" && call ms\do_ms.bat && popd
399 @pushd "$(SSLDIR)" && $(MAKE) /f ms\nt.mak all && popd
400 !endif
401
402 !ifndef FOSSIL_ENABLE_MINIZ
403 APPTARGETS = $(APPTARGETS) zlib
404 !endif
405
406 !ifdef FOSSIL_ENABLE_SSL
407 APPTARGETS = $(APPTARGETS) openssl
408 !endif
409
410 $(APPNAME) : translate$E mkindex$E headers $(OBJ) $(OX)\linkopts $(APPTARGETS)
411 cd $(OX)
412 link $(LDFLAGS) /OUT:$@ $(LIBDIR) Wsetargv.obj fossil.res @linkopts
413
414 $(OX)\linkopts: $B\win\Makefile.msc
415 echo $(OX)\add.obj > $@
416

Keyboard Shortcuts

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