Fossil SCM

New clean-zlib, clean-openssl, and clean-tcl targets in the MinGW makefiles. Cherrypick of [9112867c2d].

mistachkin 2013-09-17 09:16 trunk
Commit 249f6075d9c207dda14bb732a069e1671a8f3fc1
Parent e10d1171252498a…
3 files changed +9 +9 +9
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+9
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -703,18 +703,27 @@
703703
 endif
704704
705705
 zlib:
706706
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
707707
708
+clean-zlib:
709
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
710
+
708711
 openssl: zlib
709712
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
710713
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
711714
715
+clean-openssl:
716
+ $(MAKE) -C $(OPENSSLLIBDIR) clean
717
+
712718
 tcl:
713719
 cd $(TCLSRCDIR)/win;./configure
714720
 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
715721
722
+clean-tcl:
723
+ $(MAKE) -C $(TCLSRCDIR)/win distclean
724
+
716725
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
717726
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
718727
719728
 # This rule prevents make from using its default rules to try build
720729
 # an executable named "manifest" out of the file named "manifest.c"
721730
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -703,18 +703,27 @@
703 endif
704
705 zlib:
706 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -703,18 +703,27 @@
703 endif
704
705 zlib:
706 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
707
708 clean-zlib:
709 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
710
711 openssl: zlib
712 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
713 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
714
715 clean-openssl:
716 $(MAKE) -C $(OPENSSLLIBDIR) clean
717
718 tcl:
719 cd $(TCLSRCDIR)/win;./configure
720 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
721
722 clean-tcl:
723 $(MAKE) -C $(TCLSRCDIR)/win distclean
724
725 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
726 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
727
728 # This rule prevents make from using its default rules to try build
729 # an executable named "manifest" out of the file named "manifest.c"
730
M win/Makefile.mingw
+9
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -670,18 +670,27 @@
670670
 endif
671671
672672
 zlib:
673673
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
674674
675
+clean-zlib:
676
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
677
+
675678
 openssl: zlib
676679
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
677680
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
678681
682
+clean-openssl:
683
+ $(MAKE) -C $(OPENSSLLIBDIR) clean
684
+
679685
 tcl:
680686
 cd $(TCLSRCDIR)/win;./configure
681687
 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
682688
689
+clean-tcl:
690
+ $(MAKE) -C $(TCLSRCDIR)/win distclean
691
+
683692
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
684693
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
685694
686695
 # This rule prevents make from using its default rules to try build
687696
 # an executable named "manifest" out of the file named "manifest.c"
688697
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -670,18 +670,27 @@
670 endif
671
672 zlib:
673 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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
+++ win/Makefile.mingw
@@ -670,18 +670,27 @@
670 endif
671
672 zlib:
673 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
674
675 clean-zlib:
676 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
677
678 openssl: zlib
679 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
680 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
681
682 clean-openssl:
683 $(MAKE) -C $(OPENSSLLIBDIR) clean
684
685 tcl:
686 cd $(TCLSRCDIR)/win;./configure
687 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
688
689 clean-tcl:
690 $(MAKE) -C $(TCLSRCDIR)/win distclean
691
692 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
693 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
694
695 # This rule prevents make from using its default rules to try build
696 # an executable named "manifest" out of the file named "manifest.c"
697
M win/Makefile.mingw.mistachkin
+9
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -670,18 +670,27 @@
670670
 endif
671671
672672
 zlib:
673673
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
674674
675
+clean-zlib:
676
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
677
+
675678
 openssl: zlib
676679
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
677680
 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
678681
682
+clean-openssl:
683
+ $(MAKE) -C $(OPENSSLLIBDIR) clean
684
+
679685
 tcl:
680686
 cd $(TCLSRCDIR)/win;./configure
681687
 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
682688
689
+clean-tcl:
690
+ $(MAKE) -C $(TCLSRCDIR)/win distclean
691
+
683692
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
684693
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
685694
686695
 # This rule prevents make from using its default rules to try build
687696
 # an executable named "manifest" out of the file named "manifest.c"
688697
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -670,18 +670,27 @@
670 endif
671
672 zlib:
673 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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
@@ -670,18 +670,27 @@
670 endif
671
672 zlib:
673 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
674
675 clean-zlib:
676 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc clean
677
678 openssl: zlib
679 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
680 $(MAKE) -C $(OPENSSLLIBDIR) build_libs
681
682 clean-openssl:
683 $(MAKE) -C $(OPENSSLLIBDIR) clean
684
685 tcl:
686 cd $(TCLSRCDIR)/win;./configure
687 $(MAKE) -C $(TCLSRCDIR)/win $(TCLTARGET)
688
689 clean-tcl:
690 $(MAKE) -C $(TCLSRCDIR)/win distclean
691
692 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
693 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
694
695 # This rule prevents make from using its default rules to try build
696 # an executable named "manifest" out of the file named "manifest.c"
697

Keyboard Shortcuts

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