Some presentation polish in man.cgi:

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 07545dfd7c25ead45bbf3d734bee52e4bfaff50a..dd938c96d7681e2159dd5de01cba81ef5180fd30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,9 @@ CFLAGS                += -DUSE_WCHAR
 # variable.
 #CFLAGS                += -DUSE_MANPATH
 
-# If your system supports static binaries only, uncomment this.
+# If your system supports static binaries only, uncomment this.  This
+# appears only to be BSD UNIX systems (Mac OS X has no support and Linux
+# requires -pthreads for static libdb).
 STATIC          = -static
 
 CFLAGS         += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
@@ -62,21 +64,28 @@ DBLN                 = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln
 all: mandoc preconv demandoc $(DBBIN)
 
 SRCS            = Makefile \
+                  TODO \
                   apropos.1 \
                   apropos.c \
+                  apropos_db.c \
+                  apropos_db.h \
                   arch.c \
                   arch.in \
                   att.c \
                   att.in \
+                  catman.8 \
+                  catman.c \
+                  cgi.c \
                   chars.c \
                   chars.in \
+                  compat_fgetln.c \
                   compat_getsubopt.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   config.h.post \
                   config.h.pre \
-                  demandoc.c \
                   demandoc.1 \
+                  demandoc.c \
                   eqn.7 \
                   eqn.c \
                   eqn_html.c \
@@ -95,10 +104,11 @@ SRCS                = Makefile \
                   libroff.h \
                   main.c \
                   main.h \
-                  man.h \
                   man.7 \
                   man.c \
                   man.cgi.7 \
+                  man-cgi.css \
+                  man.h \
                   man_hash.c \
                   man_html.c \
                   man_macro.c \
@@ -108,17 +118,15 @@ SRCS               = Makefile \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \
+                  mandoc_char.7 \
                   mandocdb.8 \
                   mandocdb.c \
                   mandocdb.h \
-                  mandoc_char.7 \
                   manpath.c \
                   manpath.h \
-                  catman.c \
-                  catman.8 \
-                  mdoc.h \
                   mdoc.7 \
                   mdoc.c \
+                  mdoc.h \
                   mdoc_argv.c \
                   mdoc_hash.c \
                   mdoc_html.c \
@@ -134,6 +142,7 @@ SRCS                 = Makefile \
                   preconv.c \
                   predefs.in \
                   read.c \
+                  regress \
                   roff.7 \
                   roff.c \
                   st.c \
@@ -150,6 +159,7 @@ SRCS                 = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
+                  test-fgetln.c \
                   test-getsubopt.c \
                   test-mmap.c \
                   test-strlcat.c \
@@ -157,7 +167,8 @@ SRCS                 = Makefile \
                   test-strptime.c \
                   tree.c \
                   vol.c \
-                  vol.in
+                  vol.in \
+                  whatis.1
 
 LIBMAN_OBJS     = man.o \
                   man_hash.o \
@@ -217,10 +228,12 @@ LIBMANDOC_LNS      = $(LIBMAN_LNS) \
                   msec.ln \
                   read.ln
 
-COMPAT_OBJS     = compat_getsubopt.o \
+COMPAT_OBJS     = compat_fgetln.o \
+                  compat_getsubopt.o \
                   compat_strlcat.o \
                   compat_strlcpy.o
-COMPAT_LNS      = compat_getsubopt.ln \
+COMPAT_LNS      = compat_fgetln.ln \
+                  compat_getsubopt.ln \
                   compat_strlcat.ln \
                   compat_strlcpy.ln
 
@@ -336,6 +349,11 @@ INDEX_MANS  = apropos.1.html \
                   apropos.1.ps \
                   apropos.1.pdf \
                   apropos.1.txt \
+                  catman.8.html \
+                  catman.8.xhtml \
+                  catman.8.ps \
+                  catman.8.pdf \
+                  catman.8.txt \
                   demandoc.1.html \
                   demandoc.1.xhtml \
                   demandoc.1.ps \
@@ -346,6 +364,11 @@ INDEX_MANS  = apropos.1.html \
                   mandoc.1.ps \
                   mandoc.1.pdf \
                   mandoc.1.txt \
+                  whatis.1.html \
+                  whatis.1.xhtml \
+                  whatis.1.ps \
+                  whatis.1.pdf \
+                  whatis.1.txt \
                   mandoc.3.html \
                   mandoc.3.xhtml \
                   mandoc.3.ps \
@@ -361,6 +384,11 @@ INDEX_MANS  = apropos.1.html \
                   man.7.ps \
                   man.7.pdf \
                   man.7.txt \
+                  man.cgi.7.html \
+                  man.cgi.7.xhtml \
+                  man.cgi.7.ps \
+                  man.cgi.7.pdf \
+                  man.cgi.7.txt \
                   mandoc_char.7.html \
                   mandoc_char.7.xhtml \
                   mandoc_char.7.ps \
@@ -412,7 +440,7 @@ clean:
        rm -f llib-lmandocdb.ln $(MANDOCDB_LNS)
        rm -f preconv $(PRECONV_OBJS)
        rm -f llib-lpreconv.ln $(PRECONV_LNS)
-       rm -f apropos $(APROPOS_OBJS)
+       rm -f apropos whatis $(APROPOS_OBJS)
        rm -f llib-lapropos.ln $(APROPOS_LNS)
        rm -f man.cgi $(CGI_OBJS)
        rm -f llib-lman.cgi.ln $(CGI_LNS)
@@ -425,6 +453,7 @@ clean:
        rm -f config.h config.log $(COMPAT_OBJS) $(COMPAT_LNS)
        rm -f mdocml.tar.gz mdocml-win32.zip mdocml-win64.zip mdocml-macosx.zip
        rm -f index.html $(INDEX_OBJS)
+       rm -rf test-fgetln.DSYM
        rm -rf test-strlcpy.DSYM
        rm -rf test-strlcat.DSYM 
        rm -rf test-strptime.DSYM 
@@ -453,7 +482,7 @@ installcgi: all
        mkdir -p $(DESTDIR)$(HTDOCDIR)
        $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
-       $(INSTALL_DATA) man.cgi.css $(DESTDIR)$(HTDOCDIR)
+       $(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
 
 installwww: www
        mkdir -p $(PREFIX)/snapshots
@@ -563,6 +592,10 @@ config.h: config.h.pre config.h.post
        rm -f config.log
        ( cat config.h.pre; \
          echo; \
+         if $(CC) $(CFLAGS) -Werror -o test-fgetln test-fgetln.c >> config.log 2>&1; then \
+               echo '#define HAVE_FGETLN'; \
+               rm test-fgetln; \
+         fi; \
          if $(CC) $(CFLAGS) -Werror -o test-strptime test-strptime.c >> config.log 2>&1; then \
                echo '#define HAVE_STRPTIME'; \
                rm test-strptime; \