X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=GNUmakefile.in;h=2abf75d741660cfa944f65001e61cb170eb0b8bb;hb=33645689c64334432e8ebf1a4981983b6082b33f;hp=f5ca9da703bc001b83a55ed0e99c05113452f7db;hpb=100f48795eee7d2996bff48871bf745af01811c7;p=privoxy.git diff --git a/GNUmakefile.in b/GNUmakefile.in index f5ca9da7..2abf75d7 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: GNUmakefile is built automatically from GNUmakefile.in # -# Written by and Copyright (C) 2001-2018 members of the +# Written by and Copyright (C) 2001-2020 members of the # Privoxy team. https://www.privoxy.org/ # # Based on the Internet Junkbuster originally written @@ -32,7 +32,7 @@ @SET_MAKE@ ############################################################################# -# Version number (for RPM) +# Version number ############################################################################# VERSION_MAJOR = @VERSION_MAJOR@ @@ -42,7 +42,7 @@ CODE_STATUS = @CODE_STATUS@ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_POINT) SNAPVERSION = $(VERSION)-$(shell date "+%Y%m%d") -SOURCE_DATE_EPOCH = @SOURCE_DATE_EPOCH@ +SOURCE_DATE_EPOCH ?= @SOURCE_DATE_EPOCH@ MTREE_SPEC_FILE = privoxy-$(VERSION)-$(CODE_STATUS).spec ############################################################################# @@ -201,7 +201,7 @@ CONFIGS = config trust default.action match-all.action \ CONFIG_FILES = $(CONFIGS) \ `find templates/ -type f | grep -v "CVS" | grep -v "\.\#" | grep -v ".*~" | grep -v ".cvsignore" | grep -v "TAGS" | sort` -DOC_FILES = AUTHORS LICENSE README ChangeLog INSTALL \ +DOC_FILES = AUTHORS LICENSE LICENSE.GPLv3 README ChangeLog INSTALL \ `find doc/webserver/ -name "*.html" | grep -v "\(webserver\|team\)\/index\.html" | sort` \ `find doc/webserver/ -name "*.css" | sort` \ $(MAN_PAGE) @@ -231,10 +231,18 @@ W32_HDRS = @WIN_ONLY@w32log.h w32taskbar.h win32.h w32res.h w32svrapi.h W32_LIB = @WIN_ONLY@-lwsock32 -lcomctl32 W32_INIS = @WIN_ONLY@config.txt trust.txt -SSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY@ssl.c +SSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY@ssl_common.c SSL_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.o) SSL_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY@$(SSL_SRC:.c=.h) project.h +MBEDTLS_SRC = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@ssl.c +MBEDTLS_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@$(MBEDTLS_SRC:.c=.o) +MBEDTLS_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY_MBEDTLS@$(MBEDTLS_SRC:.c=.h) + +OPENSSL_SRC = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@openssl.c +OPENSSL_OBJS = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@$(OPENSSL_SRC:.c=.o) +OPENSSL_HDRS = @FEATURE_HTTPS_INSPECTION_ONLY_OPENSSL@$(OPENSSL_SRC:.c=.h) + PCRS_SRC = @STATIC_PCRS_ONLY@pcrs.c PCRS_OBJS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.@OBJEXT@) PCRS_HDRS = @STATIC_PCRS_ONLY@$(PCRS_SRC:.c=.h) @@ -259,9 +267,9 @@ SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) $(SSL_SRC) -OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(SSL_OBJS) -HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(SSL_HDRS) +SRCS = $(C_SRC) $(CLIENT_TAG_SRC) $(FUZZ_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) $(SSL_SRC) $(MBEDTLS_SRC) $(OPENSSL_SRC) +OBJS = $(C_OBJS) $(CLIENT_TAG_OBJS) $(FUZZ_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(SSL_OBJS) $(MBEDTLS_OBJS) $(OPENSSL_OBJS) +HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(SSL_HDRS) $(MBEDTLS_HDRS) $(OPENSSL_HDRS) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -280,7 +288,6 @@ SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ OTHER_CFLAGS = CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ - -Imbedtls/include \ @STATIC_PCRE_ONLY@ -Ipcre LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) @@ -438,7 +445,8 @@ tarball-dist: dist-check clean clobber for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \ - -name "PACKAGERS" -o -path "*.git/*" \) | sort`; do \ + -name "PACKAGERS" -o -path "*.git/*" \ + -o -path "*/doc/webserver/feeds*" \) | sort`; do \ files="$$files privoxy-$(VERSION)-$(CODE_STATUS)/$$i"; \ done && \ cd .. && $(TAR) -cvhf privoxy-$(VERSION)-$(CODE_STATUS)-src.tar $$files ; \ @@ -454,7 +462,8 @@ mtree-spec: $(ECHO) "#mtree 2.0" > $(MTREE_SPEC_FILE) for i in `find . -type f -a -not \( -path "*/CVS*" -o -name ".*" \ -o -path "*/debian/*" -o -path "*/actions/*" -o -name "*.php" -o \ - -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \) | env -i sort`; do \ + -name "PACKAGERS" -o -path "*.git/*" -o -name "*.spec" \ + -o -path "*/doc/webserver/feeds*" \) | env -i sort`; do \ $(ECHO) "privoxy-$(VERSION)-$(CODE_STATUS)/$$i time=$(SOURCE_DATE_EPOCH) type=file uname=privoxy gname=privoxy mode=0555"; \ done >> $(MTREE_SPEC_FILE) $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS) @@ -565,6 +574,7 @@ groff2html: dok-readme: dok-release cd doc/source && $(DB_TXT)-notoc -V nochunks readme.sgml > tmp.html &&\ $(W3M_DUMP) tmp.html > ../../README ;\ + $(PERL) -pi'' -e 's@doc/source/readme\.sgml@README@' ../../README; \ $(DB_TXT)-notoc -V nochunks install.sgml > tmp.html &&\ $(W3M_DUMP) tmp.html > ../../INSTALL ;\ $(RM) tmp.* @@ -579,7 +589,9 @@ dok-webserver: s/<\/HEAD/\n<\/HEAD/;\ s/\.\d\. //;\ s/__copy/©/;\ - s@(\1@; s@(
\1@; s@(\n\1@; \ + s@www.lalal.ai@