Fossil SCM
Merge trunk. On MinGW, build openssl library without ssl2 and ssl2 support.
Commit
06455d1e95d7c8b1d01a43b9116ec1a5bebe0dc8
Parent
d6e8e26d41a4154…
6 files changed
+1
+1
+1
+1
+13
+13
+1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -548,10 +548,11 @@ | ||
| 548 | 548 | SSLCONFIG = mingw64 |
| 549 | 549 | ZLIBCONFIG = |
| 550 | 550 | LIBTARGETS = |
| 551 | 551 | endif |
| 552 | 552 | |
| 553 | +SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 553 | 554 | ifndef FOSSIL_ENABLE_MINIZ |
| 554 | 555 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 555 | 556 | endif |
| 556 | 557 | |
| 557 | 558 | #### The directories where the OpenSSL include and library files are located. |
| 558 | 559 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -548,10 +548,11 @@ | |
| 548 | SSLCONFIG = mingw64 |
| 549 | ZLIBCONFIG = |
| 550 | LIBTARGETS = |
| 551 | endif |
| 552 | |
| 553 | ifndef FOSSIL_ENABLE_MINIZ |
| 554 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 555 | endif |
| 556 | |
| 557 | #### The directories where the OpenSSL include and library files are located. |
| 558 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -548,10 +548,11 @@ | |
| 548 | SSLCONFIG = mingw64 |
| 549 | ZLIBCONFIG = |
| 550 | LIBTARGETS = |
| 551 | endif |
| 552 | |
| 553 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 554 | ifndef FOSSIL_ENABLE_MINIZ |
| 555 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 556 | endif |
| 557 | |
| 558 | #### The directories where the OpenSSL include and library files are located. |
| 559 |
+1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -548,10 +548,11 @@ | ||
| 548 | 548 | SSLCONFIG = mingw64 |
| 549 | 549 | ZLIBCONFIG = |
| 550 | 550 | LIBTARGETS = |
| 551 | 551 | endif |
| 552 | 552 | |
| 553 | +SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 553 | 554 | ifndef FOSSIL_ENABLE_MINIZ |
| 554 | 555 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 555 | 556 | endif |
| 556 | 557 | |
| 557 | 558 | #### The directories where the OpenSSL include and library files are located. |
| 558 | 559 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -548,10 +548,11 @@ | |
| 548 | SSLCONFIG = mingw64 |
| 549 | ZLIBCONFIG = |
| 550 | LIBTARGETS = |
| 551 | endif |
| 552 | |
| 553 | ifndef FOSSIL_ENABLE_MINIZ |
| 554 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 555 | endif |
| 556 | |
| 557 | #### The directories where the OpenSSL include and library files are located. |
| 558 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -548,10 +548,11 @@ | |
| 548 | SSLCONFIG = mingw64 |
| 549 | ZLIBCONFIG = |
| 550 | LIBTARGETS = |
| 551 | endif |
| 552 | |
| 553 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 554 | ifndef FOSSIL_ENABLE_MINIZ |
| 555 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 556 | endif |
| 557 | |
| 558 | #### The directories where the OpenSSL include and library files are located. |
| 559 |
+1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -121,10 +121,11 @@ | ||
| 121 | 121 | SSLCONFIG = mingw64 |
| 122 | 122 | ZLIBCONFIG = |
| 123 | 123 | LIBTARGETS = |
| 124 | 124 | endif |
| 125 | 125 | |
| 126 | +SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 126 | 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | 129 | endif |
| 129 | 130 | |
| 130 | 131 | #### The directories where the OpenSSL include and library files are located. |
| 131 | 132 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | endif |
| 129 | |
| 130 | #### The directories where the OpenSSL include and library files are located. |
| 131 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 129 | endif |
| 130 | |
| 131 | #### The directories where the OpenSSL include and library files are located. |
| 132 |
+1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -121,10 +121,11 @@ | ||
| 121 | 121 | SSLCONFIG = mingw64 |
| 122 | 122 | ZLIBCONFIG = |
| 123 | 123 | LIBTARGETS = |
| 124 | 124 | endif |
| 125 | 125 | |
| 126 | +SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 126 | 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | 129 | endif |
| 129 | 130 | |
| 130 | 131 | #### The directories where the OpenSSL include and library files are located. |
| 131 | 132 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | endif |
| 129 | |
| 130 | #### The directories where the OpenSSL include and library files are located. |
| 131 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 129 | endif |
| 130 | |
| 131 | #### The directories where the OpenSSL include and library files are located. |
| 132 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -121,10 +121,11 @@ | ||
| 121 | 121 | SSLCONFIG = mingw64 |
| 122 | 122 | ZLIBCONFIG = |
| 123 | 123 | LIBTARGETS = |
| 124 | 124 | endif |
| 125 | 125 | |
| 126 | +SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 126 | 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | 129 | endif |
| 129 | 130 | |
| 130 | 131 | #### The directories where the OpenSSL include and library files are located. |
| @@ -435,10 +436,11 @@ | ||
| 435 | 436 | $(SRCDIR)/schema.c \ |
| 436 | 437 | $(SRCDIR)/search.c \ |
| 437 | 438 | $(SRCDIR)/setup.c \ |
| 438 | 439 | $(SRCDIR)/sha1.c \ |
| 439 | 440 | $(SRCDIR)/shun.c \ |
| 441 | + $(SRCDIR)/sitemap.c \ | |
| 440 | 442 | $(SRCDIR)/skins.c \ |
| 441 | 443 | $(SRCDIR)/sqlcmd.c \ |
| 442 | 444 | $(SRCDIR)/stash.c \ |
| 443 | 445 | $(SRCDIR)/stat.c \ |
| 444 | 446 | $(SRCDIR)/style.c \ |
| @@ -556,10 +558,11 @@ | ||
| 556 | 558 | $(OBJDIR)/schema_.c \ |
| 557 | 559 | $(OBJDIR)/search_.c \ |
| 558 | 560 | $(OBJDIR)/setup_.c \ |
| 559 | 561 | $(OBJDIR)/sha1_.c \ |
| 560 | 562 | $(OBJDIR)/shun_.c \ |
| 563 | + $(OBJDIR)/sitemap_.c \ | |
| 561 | 564 | $(OBJDIR)/skins_.c \ |
| 562 | 565 | $(OBJDIR)/sqlcmd_.c \ |
| 563 | 566 | $(OBJDIR)/stash_.c \ |
| 564 | 567 | $(OBJDIR)/stat_.c \ |
| 565 | 568 | $(OBJDIR)/style_.c \ |
| @@ -674,10 +677,11 @@ | ||
| 674 | 677 | $(OBJDIR)/schema.o \ |
| 675 | 678 | $(OBJDIR)/search.o \ |
| 676 | 679 | $(OBJDIR)/setup.o \ |
| 677 | 680 | $(OBJDIR)/sha1.o \ |
| 678 | 681 | $(OBJDIR)/shun.o \ |
| 682 | + $(OBJDIR)/sitemap.o \ | |
| 679 | 683 | $(OBJDIR)/skins.o \ |
| 680 | 684 | $(OBJDIR)/sqlcmd.o \ |
| 681 | 685 | $(OBJDIR)/stash.o \ |
| 682 | 686 | $(OBJDIR)/stat.o \ |
| 683 | 687 | $(OBJDIR)/style.o \ |
| @@ -985,10 +989,11 @@ | ||
| 985 | 989 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 986 | 990 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 987 | 991 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 988 | 992 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 989 | 993 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 994 | + $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ | |
| 990 | 995 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| 991 | 996 | $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \ |
| 992 | 997 | $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \ |
| 993 | 998 | $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \ |
| 994 | 999 | $(OBJDIR)/style_.c:$(OBJDIR)/style.h \ |
| @@ -1718,10 +1723,18 @@ | ||
| 1718 | 1723 | |
| 1719 | 1724 | $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h |
| 1720 | 1725 | $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c |
| 1721 | 1726 | |
| 1722 | 1727 | $(OBJDIR)/shun.h: $(OBJDIR)/headers |
| 1728 | + | |
| 1729 | +$(OBJDIR)/sitemap_.c: $(SRCDIR)/sitemap.c $(TRANSLATE) | |
| 1730 | + $(TRANSLATE) $(SRCDIR)/sitemap.c >$@ | |
| 1731 | + | |
| 1732 | +$(OBJDIR)/sitemap.o: $(OBJDIR)/sitemap_.c $(OBJDIR)/sitemap.h $(SRCDIR)/config.h | |
| 1733 | + $(XTCC) -o $(OBJDIR)/sitemap.o -c $(OBJDIR)/sitemap_.c | |
| 1734 | + | |
| 1735 | +$(OBJDIR)/sitemap.h: $(OBJDIR)/headers | |
| 1723 | 1736 | |
| 1724 | 1737 | $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE) |
| 1725 | 1738 | $(TRANSLATE) $(SRCDIR)/skins.c >$@ |
| 1726 | 1739 | |
| 1727 | 1740 | $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h |
| 1728 | 1741 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | endif |
| 129 | |
| 130 | #### The directories where the OpenSSL include and library files are located. |
| @@ -435,10 +436,11 @@ | |
| 435 | $(SRCDIR)/schema.c \ |
| 436 | $(SRCDIR)/search.c \ |
| 437 | $(SRCDIR)/setup.c \ |
| 438 | $(SRCDIR)/sha1.c \ |
| 439 | $(SRCDIR)/shun.c \ |
| 440 | $(SRCDIR)/skins.c \ |
| 441 | $(SRCDIR)/sqlcmd.c \ |
| 442 | $(SRCDIR)/stash.c \ |
| 443 | $(SRCDIR)/stat.c \ |
| 444 | $(SRCDIR)/style.c \ |
| @@ -556,10 +558,11 @@ | |
| 556 | $(OBJDIR)/schema_.c \ |
| 557 | $(OBJDIR)/search_.c \ |
| 558 | $(OBJDIR)/setup_.c \ |
| 559 | $(OBJDIR)/sha1_.c \ |
| 560 | $(OBJDIR)/shun_.c \ |
| 561 | $(OBJDIR)/skins_.c \ |
| 562 | $(OBJDIR)/sqlcmd_.c \ |
| 563 | $(OBJDIR)/stash_.c \ |
| 564 | $(OBJDIR)/stat_.c \ |
| 565 | $(OBJDIR)/style_.c \ |
| @@ -674,10 +677,11 @@ | |
| 674 | $(OBJDIR)/schema.o \ |
| 675 | $(OBJDIR)/search.o \ |
| 676 | $(OBJDIR)/setup.o \ |
| 677 | $(OBJDIR)/sha1.o \ |
| 678 | $(OBJDIR)/shun.o \ |
| 679 | $(OBJDIR)/skins.o \ |
| 680 | $(OBJDIR)/sqlcmd.o \ |
| 681 | $(OBJDIR)/stash.o \ |
| 682 | $(OBJDIR)/stat.o \ |
| 683 | $(OBJDIR)/style.o \ |
| @@ -985,10 +989,11 @@ | |
| 985 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 986 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 987 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 988 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 989 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 990 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| 991 | $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \ |
| 992 | $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \ |
| 993 | $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \ |
| 994 | $(OBJDIR)/style_.c:$(OBJDIR)/style.h \ |
| @@ -1718,10 +1723,18 @@ | |
| 1718 | |
| 1719 | $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h |
| 1720 | $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c |
| 1721 | |
| 1722 | $(OBJDIR)/shun.h: $(OBJDIR)/headers |
| 1723 | |
| 1724 | $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE) |
| 1725 | $(TRANSLATE) $(SRCDIR)/skins.c >$@ |
| 1726 | |
| 1727 | $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h |
| 1728 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 129 | endif |
| 130 | |
| 131 | #### The directories where the OpenSSL include and library files are located. |
| @@ -435,10 +436,11 @@ | |
| 436 | $(SRCDIR)/schema.c \ |
| 437 | $(SRCDIR)/search.c \ |
| 438 | $(SRCDIR)/setup.c \ |
| 439 | $(SRCDIR)/sha1.c \ |
| 440 | $(SRCDIR)/shun.c \ |
| 441 | $(SRCDIR)/sitemap.c \ |
| 442 | $(SRCDIR)/skins.c \ |
| 443 | $(SRCDIR)/sqlcmd.c \ |
| 444 | $(SRCDIR)/stash.c \ |
| 445 | $(SRCDIR)/stat.c \ |
| 446 | $(SRCDIR)/style.c \ |
| @@ -556,10 +558,11 @@ | |
| 558 | $(OBJDIR)/schema_.c \ |
| 559 | $(OBJDIR)/search_.c \ |
| 560 | $(OBJDIR)/setup_.c \ |
| 561 | $(OBJDIR)/sha1_.c \ |
| 562 | $(OBJDIR)/shun_.c \ |
| 563 | $(OBJDIR)/sitemap_.c \ |
| 564 | $(OBJDIR)/skins_.c \ |
| 565 | $(OBJDIR)/sqlcmd_.c \ |
| 566 | $(OBJDIR)/stash_.c \ |
| 567 | $(OBJDIR)/stat_.c \ |
| 568 | $(OBJDIR)/style_.c \ |
| @@ -674,10 +677,11 @@ | |
| 677 | $(OBJDIR)/schema.o \ |
| 678 | $(OBJDIR)/search.o \ |
| 679 | $(OBJDIR)/setup.o \ |
| 680 | $(OBJDIR)/sha1.o \ |
| 681 | $(OBJDIR)/shun.o \ |
| 682 | $(OBJDIR)/sitemap.o \ |
| 683 | $(OBJDIR)/skins.o \ |
| 684 | $(OBJDIR)/sqlcmd.o \ |
| 685 | $(OBJDIR)/stash.o \ |
| 686 | $(OBJDIR)/stat.o \ |
| 687 | $(OBJDIR)/style.o \ |
| @@ -985,10 +989,11 @@ | |
| 989 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 990 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 991 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 992 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 993 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 994 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 995 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| 996 | $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \ |
| 997 | $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \ |
| 998 | $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \ |
| 999 | $(OBJDIR)/style_.c:$(OBJDIR)/style.h \ |
| @@ -1718,10 +1723,18 @@ | |
| 1723 | |
| 1724 | $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h |
| 1725 | $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c |
| 1726 | |
| 1727 | $(OBJDIR)/shun.h: $(OBJDIR)/headers |
| 1728 | |
| 1729 | $(OBJDIR)/sitemap_.c: $(SRCDIR)/sitemap.c $(TRANSLATE) |
| 1730 | $(TRANSLATE) $(SRCDIR)/sitemap.c >$@ |
| 1731 | |
| 1732 | $(OBJDIR)/sitemap.o: $(OBJDIR)/sitemap_.c $(OBJDIR)/sitemap.h $(SRCDIR)/config.h |
| 1733 | $(XTCC) -o $(OBJDIR)/sitemap.o -c $(OBJDIR)/sitemap_.c |
| 1734 | |
| 1735 | $(OBJDIR)/sitemap.h: $(OBJDIR)/headers |
| 1736 | |
| 1737 | $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE) |
| 1738 | $(TRANSLATE) $(SRCDIR)/skins.c >$@ |
| 1739 | |
| 1740 | $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h |
| 1741 |
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -121,10 +121,11 @@ | ||
| 121 | 121 | SSLCONFIG = mingw64 |
| 122 | 122 | ZLIBCONFIG = |
| 123 | 123 | LIBTARGETS = |
| 124 | 124 | endif |
| 125 | 125 | |
| 126 | +SSLCONFIG += no-ssl2 no-ssl3 no-shared | |
| 126 | 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | 129 | endif |
| 129 | 130 | |
| 130 | 131 | #### The directories where the OpenSSL include and library files are located. |
| @@ -435,10 +436,11 @@ | ||
| 435 | 436 | $(SRCDIR)/schema.c \ |
| 436 | 437 | $(SRCDIR)/search.c \ |
| 437 | 438 | $(SRCDIR)/setup.c \ |
| 438 | 439 | $(SRCDIR)/sha1.c \ |
| 439 | 440 | $(SRCDIR)/shun.c \ |
| 441 | + $(SRCDIR)/sitemap.c \ | |
| 440 | 442 | $(SRCDIR)/skins.c \ |
| 441 | 443 | $(SRCDIR)/sqlcmd.c \ |
| 442 | 444 | $(SRCDIR)/stash.c \ |
| 443 | 445 | $(SRCDIR)/stat.c \ |
| 444 | 446 | $(SRCDIR)/style.c \ |
| @@ -556,10 +558,11 @@ | ||
| 556 | 558 | $(OBJDIR)/schema_.c \ |
| 557 | 559 | $(OBJDIR)/search_.c \ |
| 558 | 560 | $(OBJDIR)/setup_.c \ |
| 559 | 561 | $(OBJDIR)/sha1_.c \ |
| 560 | 562 | $(OBJDIR)/shun_.c \ |
| 563 | + $(OBJDIR)/sitemap_.c \ | |
| 561 | 564 | $(OBJDIR)/skins_.c \ |
| 562 | 565 | $(OBJDIR)/sqlcmd_.c \ |
| 563 | 566 | $(OBJDIR)/stash_.c \ |
| 564 | 567 | $(OBJDIR)/stat_.c \ |
| 565 | 568 | $(OBJDIR)/style_.c \ |
| @@ -674,10 +677,11 @@ | ||
| 674 | 677 | $(OBJDIR)/schema.o \ |
| 675 | 678 | $(OBJDIR)/search.o \ |
| 676 | 679 | $(OBJDIR)/setup.o \ |
| 677 | 680 | $(OBJDIR)/sha1.o \ |
| 678 | 681 | $(OBJDIR)/shun.o \ |
| 682 | + $(OBJDIR)/sitemap.o \ | |
| 679 | 683 | $(OBJDIR)/skins.o \ |
| 680 | 684 | $(OBJDIR)/sqlcmd.o \ |
| 681 | 685 | $(OBJDIR)/stash.o \ |
| 682 | 686 | $(OBJDIR)/stat.o \ |
| 683 | 687 | $(OBJDIR)/style.o \ |
| @@ -985,10 +989,11 @@ | ||
| 985 | 989 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 986 | 990 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 987 | 991 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 988 | 992 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 989 | 993 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 994 | + $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ | |
| 990 | 995 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| 991 | 996 | $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \ |
| 992 | 997 | $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \ |
| 993 | 998 | $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \ |
| 994 | 999 | $(OBJDIR)/style_.c:$(OBJDIR)/style.h \ |
| @@ -1718,10 +1723,18 @@ | ||
| 1718 | 1723 | |
| 1719 | 1724 | $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h |
| 1720 | 1725 | $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c |
| 1721 | 1726 | |
| 1722 | 1727 | $(OBJDIR)/shun.h: $(OBJDIR)/headers |
| 1728 | + | |
| 1729 | +$(OBJDIR)/sitemap_.c: $(SRCDIR)/sitemap.c $(TRANSLATE) | |
| 1730 | + $(TRANSLATE) $(SRCDIR)/sitemap.c >$@ | |
| 1731 | + | |
| 1732 | +$(OBJDIR)/sitemap.o: $(OBJDIR)/sitemap_.c $(OBJDIR)/sitemap.h $(SRCDIR)/config.h | |
| 1733 | + $(XTCC) -o $(OBJDIR)/sitemap.o -c $(OBJDIR)/sitemap_.c | |
| 1734 | + | |
| 1735 | +$(OBJDIR)/sitemap.h: $(OBJDIR)/headers | |
| 1723 | 1736 | |
| 1724 | 1737 | $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE) |
| 1725 | 1738 | $(TRANSLATE) $(SRCDIR)/skins.c >$@ |
| 1726 | 1739 | |
| 1727 | 1740 | $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h |
| 1728 | 1741 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | ifndef FOSSIL_ENABLE_MINIZ |
| 127 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 128 | endif |
| 129 | |
| 130 | #### The directories where the OpenSSL include and library files are located. |
| @@ -435,10 +436,11 @@ | |
| 435 | $(SRCDIR)/schema.c \ |
| 436 | $(SRCDIR)/search.c \ |
| 437 | $(SRCDIR)/setup.c \ |
| 438 | $(SRCDIR)/sha1.c \ |
| 439 | $(SRCDIR)/shun.c \ |
| 440 | $(SRCDIR)/skins.c \ |
| 441 | $(SRCDIR)/sqlcmd.c \ |
| 442 | $(SRCDIR)/stash.c \ |
| 443 | $(SRCDIR)/stat.c \ |
| 444 | $(SRCDIR)/style.c \ |
| @@ -556,10 +558,11 @@ | |
| 556 | $(OBJDIR)/schema_.c \ |
| 557 | $(OBJDIR)/search_.c \ |
| 558 | $(OBJDIR)/setup_.c \ |
| 559 | $(OBJDIR)/sha1_.c \ |
| 560 | $(OBJDIR)/shun_.c \ |
| 561 | $(OBJDIR)/skins_.c \ |
| 562 | $(OBJDIR)/sqlcmd_.c \ |
| 563 | $(OBJDIR)/stash_.c \ |
| 564 | $(OBJDIR)/stat_.c \ |
| 565 | $(OBJDIR)/style_.c \ |
| @@ -674,10 +677,11 @@ | |
| 674 | $(OBJDIR)/schema.o \ |
| 675 | $(OBJDIR)/search.o \ |
| 676 | $(OBJDIR)/setup.o \ |
| 677 | $(OBJDIR)/sha1.o \ |
| 678 | $(OBJDIR)/shun.o \ |
| 679 | $(OBJDIR)/skins.o \ |
| 680 | $(OBJDIR)/sqlcmd.o \ |
| 681 | $(OBJDIR)/stash.o \ |
| 682 | $(OBJDIR)/stat.o \ |
| 683 | $(OBJDIR)/style.o \ |
| @@ -985,10 +989,11 @@ | |
| 985 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 986 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 987 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 988 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 989 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 990 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| 991 | $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \ |
| 992 | $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \ |
| 993 | $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \ |
| 994 | $(OBJDIR)/style_.c:$(OBJDIR)/style.h \ |
| @@ -1718,10 +1723,18 @@ | |
| 1718 | |
| 1719 | $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h |
| 1720 | $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c |
| 1721 | |
| 1722 | $(OBJDIR)/shun.h: $(OBJDIR)/headers |
| 1723 | |
| 1724 | $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE) |
| 1725 | $(TRANSLATE) $(SRCDIR)/skins.c >$@ |
| 1726 | |
| 1727 | $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h |
| 1728 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -121,10 +121,11 @@ | |
| 121 | SSLCONFIG = mingw64 |
| 122 | ZLIBCONFIG = |
| 123 | LIBTARGETS = |
| 124 | endif |
| 125 | |
| 126 | SSLCONFIG += no-ssl2 no-ssl3 no-shared |
| 127 | ifndef FOSSIL_ENABLE_MINIZ |
| 128 | SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib |
| 129 | endif |
| 130 | |
| 131 | #### The directories where the OpenSSL include and library files are located. |
| @@ -435,10 +436,11 @@ | |
| 436 | $(SRCDIR)/schema.c \ |
| 437 | $(SRCDIR)/search.c \ |
| 438 | $(SRCDIR)/setup.c \ |
| 439 | $(SRCDIR)/sha1.c \ |
| 440 | $(SRCDIR)/shun.c \ |
| 441 | $(SRCDIR)/sitemap.c \ |
| 442 | $(SRCDIR)/skins.c \ |
| 443 | $(SRCDIR)/sqlcmd.c \ |
| 444 | $(SRCDIR)/stash.c \ |
| 445 | $(SRCDIR)/stat.c \ |
| 446 | $(SRCDIR)/style.c \ |
| @@ -556,10 +558,11 @@ | |
| 558 | $(OBJDIR)/schema_.c \ |
| 559 | $(OBJDIR)/search_.c \ |
| 560 | $(OBJDIR)/setup_.c \ |
| 561 | $(OBJDIR)/sha1_.c \ |
| 562 | $(OBJDIR)/shun_.c \ |
| 563 | $(OBJDIR)/sitemap_.c \ |
| 564 | $(OBJDIR)/skins_.c \ |
| 565 | $(OBJDIR)/sqlcmd_.c \ |
| 566 | $(OBJDIR)/stash_.c \ |
| 567 | $(OBJDIR)/stat_.c \ |
| 568 | $(OBJDIR)/style_.c \ |
| @@ -674,10 +677,11 @@ | |
| 677 | $(OBJDIR)/schema.o \ |
| 678 | $(OBJDIR)/search.o \ |
| 679 | $(OBJDIR)/setup.o \ |
| 680 | $(OBJDIR)/sha1.o \ |
| 681 | $(OBJDIR)/shun.o \ |
| 682 | $(OBJDIR)/sitemap.o \ |
| 683 | $(OBJDIR)/skins.o \ |
| 684 | $(OBJDIR)/sqlcmd.o \ |
| 685 | $(OBJDIR)/stash.o \ |
| 686 | $(OBJDIR)/stat.o \ |
| 687 | $(OBJDIR)/style.o \ |
| @@ -985,10 +989,11 @@ | |
| 989 | $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \ |
| 990 | $(OBJDIR)/search_.c:$(OBJDIR)/search.h \ |
| 991 | $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \ |
| 992 | $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \ |
| 993 | $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \ |
| 994 | $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \ |
| 995 | $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \ |
| 996 | $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \ |
| 997 | $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \ |
| 998 | $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \ |
| 999 | $(OBJDIR)/style_.c:$(OBJDIR)/style.h \ |
| @@ -1718,10 +1723,18 @@ | |
| 1723 | |
| 1724 | $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h |
| 1725 | $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c |
| 1726 | |
| 1727 | $(OBJDIR)/shun.h: $(OBJDIR)/headers |
| 1728 | |
| 1729 | $(OBJDIR)/sitemap_.c: $(SRCDIR)/sitemap.c $(TRANSLATE) |
| 1730 | $(TRANSLATE) $(SRCDIR)/sitemap.c >$@ |
| 1731 | |
| 1732 | $(OBJDIR)/sitemap.o: $(OBJDIR)/sitemap_.c $(OBJDIR)/sitemap.h $(SRCDIR)/config.h |
| 1733 | $(XTCC) -o $(OBJDIR)/sitemap.o -c $(OBJDIR)/sitemap_.c |
| 1734 | |
| 1735 | $(OBJDIR)/sitemap.h: $(OBJDIR)/headers |
| 1736 | |
| 1737 | $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE) |
| 1738 | $(TRANSLATE) $(SRCDIR)/skins.c >$@ |
| 1739 | |
| 1740 | $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h |
| 1741 |