Fossil SCM

When building the new OpenSSL target in the MinGW makefile, build only what is necessary to actually compile and use Fossil.

mistachkin 2013-09-14 21:59 trunk

Commit a5073b3ae9b402a3c0259cd980487568c4fc67ac

Parent 8897edb7e13c844…

3 files changed +1 -1 +1 -1 +1 -1

M src/makemake.tcl

+1 -1

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -693,11 +693,11 @@
693	693	zlib:
694	694	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
695	695
696	696	openssl: zlib
697	697	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
698		- $(MAKE) -C $(OPENSSLLIBDIR)
	698	+ $(MAKE) -C $(OPENSSLLIBDIR) build_libs
699	699
700	700	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
701	701	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
702	702
703	703	# This rule prevents make from using its default rules to try build
704	704

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -693,11 +693,11 @@
693	zlib:
694	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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)
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

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -693,11 +693,11 @@
693	zlib:
694	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -660,11 +660,11 @@
660	660	zlib:
661	661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662	662
663	663	openssl: zlib
664	664	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665		- $(MAKE) -C $(OPENSSLLIBDIR)
	665	+ $(MAKE) -C $(OPENSSLLIBDIR) build_libs
666	666
667	667	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668	668	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669	669
670	670	# This rule prevents make from using its default rules to try build
671	671

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -660,11 +660,11 @@
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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)
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

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -660,11 +660,11 @@
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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

M win/Makefile.mingw.mistachkin

+1 -1

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -660,11 +660,11 @@
660	660	zlib:
661	661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
662	662
663	663	openssl: zlib
664	664	cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib mingw
665		- $(MAKE) -C $(OPENSSLLIBDIR)
	665	+ $(MAKE) -C $(OPENSSLLIBDIR) build_libs
666	666
667	667	$(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o zlib
668	668	$(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o
669	669
670	670	# This rule prevents make from using its default rules to try build
671	671

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -660,11 +660,11 @@
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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)
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

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -660,11 +660,11 @@
660	zlib:
661	$(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) -f win32/Makefile.gcc libz.a
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