Tag 1.8.29

michaelrsweet · Jan 3, 2016 · 18fbe8b · 18fbe8b
1 parent 406bebf
commit 18fbe8b
Show file tree

Hide file tree

Showing 497 changed files with 70,167 additions and 115,885 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
diff --git a/COMPILE.txt b/COMPILE.txt
@@ -1,4 +1,4 @@
-COMPILE.txt - 2011-12-25
+COMPILE.txt - 2016-01-02
 ------------------------
 
 REQUIREMENTS
@@ -16,8 +16,8 @@ REQUIREMENTS
 COMPILING HTMLDOC UNDER WINDOWS
 
     For the Windows version we have included Visual C++ workspace and project
-    files under the "visualc" and "vcnet" directories. You must add the FLTK
-    include and library directories to your VC++ environment options.
+    files under the "vcnet" directory. You must add the FLTK include and library
+    directories to your VC++ environment options.
 
 
 INSTALLING HTMLDOC UNDER WINDOWS
@@ -54,12 +54,6 @@ CONFIGURING HTMLDOC UNDER UNIX
 
         ./configure --prefix=/some/directory
 
-    If the OpenSSL library is in a non-standard location you can specify it
-    using:
-
-        ./configure --with-openssl-includes=/some/directory/include \
-            --with-openssl-libs=/some/directory/lib
-
     If you aren't using "cc" or "gcc" for your ANSI C compiler, you'll need to
     set the CC environment variable prior to running the configure script:
 

diff --git a/COPYING.txt b/COPYING.txt
@@ -1,15 +1,3 @@
-			       HTMLDOC License
-			      December 21, 2011
-
-
-HTMLDOC is provides under the terms of version 2 of the GNU General Public
-License with the following exception:
-
-1. HTMLDOC may be compiled against and distributed with the OpenSSL Toolkit.
-   No developer is required to provide this exception in a derived work.
-
---------------------------------------------------------------------------------
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 

diff --git a/Makedefs.in b/Makedefs.in
@@ -1,13 +1,13 @@
 #
-# "$Id$"
+#   "$Id$"
 #
-# Makefile definitions for HTMLDOC, an HTML document processing program.
+#   Makefile definitions for HTMLDOC, an HTML document processing program.
 #
-# Copyright 2011 by Michael R Sweet.
-# Copyright 1997-2010 by Easy Software Products.
+#   Copyright 2011 by Michael R Sweet.
+#   Copyright 1997-2010 by Easy Software Products.
 #
-# This program is free software.  Distribution and use rights are outlined in
-# the file "COPYING.txt".
+#   This program is free software.  Distribution and use rights are outlined in
+#   the file "COPYING.txt".
 #
 
 #
@@ -31,59 +31,41 @@ SHELL		=	/bin/sh
 # The extension to use for executables...
 EXEEXT		=	@EXEEXT@
 
-
 #
 # Directories...
 #
 
 bindir		=	@bindir@
 datadir		=	@datadir@
 datarootdir	=	@datarootdir@
-docdir		=	@docdir@
 exec_prefix	=	@exec_prefix@
 includedir	=	@includedir@
 infodir		=	@infodir@
 libdir		=	@libdir@
+libexecdir	=	@libexecdir@
 localstatedir	=	@localstatedir@
 mandir		=	@mandir@
+oldincludedir	=	@oldincludedir@
 prefix		=	@prefix@
 sbindir		=	@sbindir@
+sharedstatedir	=	@sharedstatedir@
 srcdir		=	@srcdir@
 sysconfdir	=	@sysconfdir@
 top_srcdir	=	@top_srcdir@
 
-
-#
-# Image libraries...
-#
-
-JPEGDEP		=	@JPEGDEP@
-JPEGDIR		=	@JPEGDIR@
-JPEGINC		=	@JPEGINC@
-
-PNGDEP		=	@PNGDEP@
-PNGDIR		=	@PNGDIR@
-PNGINC		=	@PNGINC@
-
-ZLIBDEP		=	@ZLIBDEP@
-ZLIBDIR		=	@ZLIBDIR@
-ZLIBINC		=	@ZLIBINC@
-
-
 #
 # Program options...
 #
 # OPTIM   defines the common compiler optimization/debugging options.
 #
 
 ARFLAGS		=	@ARFLAGS@
-CFLAGS		=	-I.. @CFLAGS@ $(OPTIM) $(PNGINC) $(JPEGINC) $(ZLIBINC)
-CXXFLAGS	=	-I.. @CXXFLAGS@ $(OPTIM) $(PNGINC) $(JPEGINC) $(ZLIBINC)
+CFLAGS		=	-I.. @CFLAGS@ @LARGEFILE@ $(OPTIM) @JPEGINC@ @PNGINC@ @ZLIBINC@
+CXXFLAGS	=	-I.. @CXXFLAGS@ @LARGEFILE@ $(OPTIM) @JPEGINC@ @PNGINC@ @ZLIBINC@
 LDFLAGS		=	@LDFLAGS@ $(OPTIM)
-LIBS		=	@SSLLIBS@ $(PNGDEP) $(JPEGDEP) $(ZLIBDEP) @LIBS@
+LIBS		=	@SSLLIBS@ @LIBS@
 OPTIM		=	@OPTIM@ @SSLFLAGS@
 
-
 #
 # Rules...
 #

diff --git a/Makefile → Makefile.in b/Makefile → Makefile.in
@@ -3,21 +3,11 @@
 #
 #   Makefile for HTMLDOC, an HTML document processing program.
 #
-#   Copyright 1997-2008 by Easy Software Products.
+#   Copyright 2011 by Michael R Sweet.
+#   Copyright 1997-2010 by Easy Software Products.
 #
-#   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "COPYING.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: HTMLDOC Licensing Information
-#       Easy Software Products
-#       516 Rio Grand Ct
-#       Morgan Hill, CA 95037 USA
-#
-#       http://www.htmldoc.org/
+#   This program is free software.  Distribution and use rights are outlined in
+#   the file "COPYING.txt".
 #
 
 #
@@ -38,15 +28,15 @@ EPM	=	epm -v --output-dir dist
 # Subdirectories...
 #
 
-DIRS	=	$(ZLIBDIR) $(JPEGDIR) $(PNGDIR) htmldoc doc
+DIRS	=	@JPEG@ @ZLIB@ @PNG@ htmldoc doc
 INSTALLDIRS =	fonts data doc htmldoc
 
 
 #
 # Make all targets...
 #
 
-all:	Makedefs config.h htmldoc.list
+all:	Makedefs Makefile config.h htmldoc.list
 	for dir in $(DIRS); do\
 		echo Making all in $$dir...;\
 		(cd $$dir; $(MAKE) -$(MAKEFLAGS)) || break;\
@@ -62,21 +52,21 @@ clean:
 		echo Cleaning in $$dir...;\
 		(cd $$dir; $(MAKE) -$(MAKEFLAGS) clean) || break;\
 	done
-
-
-#
-# Remove everything that isn't included with a distribution...
-#
-
-distclean:	clean
-	$(RM) -r dist
 	$(RM) *.bak
 	$(RM) *.bck
 	$(RM) core
 	$(RM) core.* 
 	$(RM) -r autom4te*.cache
 	$(RM) config.h config.log config.status
-	$(RM) Makedefs
+
+
+#
+# Clean everything
+#
+
+distclean:	clean
+	$(RM) Makefile Makedefs htmldoc.list desktop/htmldoc.dt
+	$(RM) desktop/htmldoc.ftr desktop/htmldoc.plist
 
 
 #
@@ -92,19 +82,52 @@ install:
 
 
 #
-# Re-run configure script as needed...
+# Makedefs
+#
+
+Makedefs:	Makedefs.in configure
+	if test -f config.status; then \
+		./config.status --recheck; \
+		./config.status; \
+	else \
+		./configure; \
+	fi
+	touch config.h
+
+
+#
+# Makefile
+#
+
+Makefile:	Makefile.in configure
+	if test -f config.status; then \
+		./config.status --recheck; \
+		./config.status; \
+	else \
+		./configure; \
+	fi
+	touch config.h
+
+
+#
+# config.h
 #
 
 config.h:	config.h.in configure
-	$(MAKE) -$(MAKEFLAGS) reconfigure
+	if test -f config.status; then \
+		./config.status --recheck; \
+		./config.status; \
+	else \
+		./configure; \
+	fi
+	touch config.h
 
-Makedefs:	Makedefs.in configure
-	$(MAKE) -$(MAKEFLAGS) reconfigure
 
-htmldoc.list:	htmldoc.list.in configure
-	$(MAKE) -$(MAKEFLAGS) reconfigure
+#
+# htmldoc.list
+#
 
-reconfigure:
+htmldoc.list:	htmldoc.list.in configure
 	if test -f config.status; then \
 		./config.status --recheck; \
 		./config.status; \
@@ -123,23 +146,6 @@ reconfigure:
 epm:
 	$(RM) -r dist
 	$(EPM) htmldoc
-	case `uname` in \
-		Linux*) $(EPM) -f rpm htmldoc ;; \
-		Darwin*) $(EPM) -f osx htmldoc ;; \
-		SunOS*) $(RPM) -f pkg htmdoc ;; \
-	esac
-
-
-#
-# Scan code using clang (http://clang.llvm.org/StaticAnalysisUsage.html)
-#
-
-.PHONY: clang
-clang:
-	$(RM) -r clang
-	cd htmldoc; scan-build -V -k -o ../clang $(MAKE) $(MFLAGS) \
-		LIBS="$(LIBS) -lstdc++" \
-		CC=ccc-analyzer CXX=ccc-analyzer clean all
 
 
 #