Updated mingw makefile for polipo to include forbidden functionality in

win32 and match it to mainline.

svn:r13374

diff --git a/contrib/polipo/Makefile.mingw b/contrib/polipo/Makefile.mingw
index 16a6572c3522e16fafa4ad1772aad333b6b0e5d9..62453d3ac14b1bcf501d7cd4cd8252c3009dc47d 100644 (file)
--- a/contrib/polipo/Makefile.mingw
+++ b/contrib/polipo/Makefile.mingw
@@ -1,8 +1,46 @@
-PREFIX = "."
-BINDIR = $(PREFIX)\
-LDLIBS = -lwsock32
+PREFIX = "C:\Program Files"
+BINDIR = $(PREFIX)\bin
+MANDIR = $(PREFIX)\man
+INFODIR = $(PREFIX)\info
+LOCAL_ROOT = 
 
-FILE_DEFINES = -DLOCAL_ROOT=\".\www\" -DDISK_CACHE_ROOT=\".\cache\"
+# To compile with Unix CC:
+
+# CDEBUGFLAGS=-O
+
+# To compile with GCC:
+
+# CC = gcc
+# CDEBUGFLAGS = -Os -g -Wall -std=gnu99
+CDEBUGFLAGS = -Os -g -Wall
+# CDEBUGFLAGS = -Os -Wall
+# CDEBUGFLAGS = -g -Wall
+
+# To compile on a pure POSIX system:
+
+# CC = c89
+# CC = c99
+# CDEBUGFLAGS=-O
+
+# To compile with icc 7, you need -restrict.  (Their bug.)
+
+# CC=icc
+# CDEBUGFLAGS = -O -restrict
+
+# On System V (Solaris, HP/UX) you need the following:
+
+# PLATFORM_DEFINES = -DSVR4
+
+# On Solaris, you need the following:
+
+# LDLIBS = -lsocket -lnsl -lresolv
+
+# On mingw, you need
+
+ EXE=.exe
+ LDLIBS = -lwsock32 -lregex
+
+FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" -DNO_DISK_CACHE -DHAVE_REGEX
 
 # You may optionally also add any of the following to DEFINES:
 #
@@ -19,10 +57,11 @@ FILE_DEFINES = -DLOCAL_ROOT=\".\www\" -DDISK_CACHE_ROOT=\".\cache\"
 #  -DNO_SOCKS to compile out the SOCKS gateway code.
 #  -DNO_FORBIDDEN to compile out the all of the forbidden URL code
 #  -DNO_REDIRECTOR to compile out the Squid-style redirector code
+#  -DNO_SYSLOG to compile out logging to syslog
 
 DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
 
-CFLAGS = -O3 -g -Wall $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
+CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES)
 
 SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
        config.c local.c http.c client.c server.c auth.c tunnel.c \
@@ -34,8 +73,8 @@ OBJS = util.o event.o io.o chunk.o atom.o object.o log.o diskcache.o main.o \
        http_parse.o parse_time.o dns.o forbidden.o \
        md5import.o ftsimport.o socks.o mingw.o
 
-polipo.exe: $(OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o polipo.exe $(OBJS) $(MD5LIBS) -lwsock32
+polipo$(EXE): $(OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o polipo$(EXE) $(OBJS) $(MD5LIBS) $(LDLIBS)
 
 ftsimport.o: ftsimport.c fts_compat.c
 
@@ -43,7 +82,51 @@ md5import.o: md5import.c md5.c
 
 .PHONY: all install install.binary install.man
 
-all: polipo$(EXE) localindex.html
+all: polipo$(EXE) polipo.info html/index.html localindex.html
+
+install: install.binary install.man
+
+install.binary: all
+       mkdir -p $(TARGET)$(BINDIR)
+       mkdir -p $(TARGET)$(LOCAL_ROOT)
+       mkdir -p $(TARGET)$(LOCAL_ROOT)/doc
+       rm -f $(TARGET)$(BINDIR)/polipo
+       cp -f polipo $(TARGET)$(BINDIR)/
+       cp -f html/* $(TARGET)$(LOCAL_ROOT)/doc
+       cp -f localindex.html $(TARGET)$(LOCAL_ROOT)/index.html
+
+install.man: all
+       mkdir -p $(TARGET)$(MANDIR)/man1
+       mkdir -p $(TARGET)$(INFODIR)
+       cp -f polipo.man $(TARGET)$(MANDIR)/man1/polipo.1
+       cp polipo.info $(TARGET)$(INFODIR)/
+       install-info --info-dir=$(TARGET)$(INFODIR) polipo.info
+
+
+polipo.info: polipo.texi
+       makeinfo polipo.texi
+
+html/index.html: polipo.texi
+       mkdir -p html
+       makeinfo --html -o html polipo.texi
+
+polipo.html: polipo.texi
+       makeinfo --html --no-split --no-headers -o polipo.html polipo.texi
+
+polipo.pdf: polipo.texi
+       texi2pdf polipo.texi
+
+polipo.ps.gz: polipo.ps
+       gzip -c polipo.ps > polipo.ps.gz
+
+polipo.ps: polipo.dvi
+       dvips -Pwww -o polipo.ps polipo.dvi
+
+polipo.dvi: polipo.texi
+       texi2dvi polipo.texi
+
+polipo.man.html: polipo.man
+       groff -man -Thtml polipo.man > polipo.man.html
 
 TAGS: $(SRCS)
        etags $(SRCS)
@@ -51,7 +134,7 @@ TAGS: $(SRCS)
 .PHONY: clean
 
 clean:
-       -rm -f polipo.exe *.o *~ core TAGS gmon.out
+       -rm -f polipo$(EXE) *.o *~ core TAGS gmon.out
        -rm -f polipo.cp polipo.fn polipo.log polipo.vr
        -rm -f polipo.cps polipo.info* polipo.pg polipo.toc polipo.vrs
        -rm -f polipo.aux polipo.dvi polipo.ky polipo.ps polipo.tp