]> git.cameronkatri.com Git - mandoc.git/blobdiff - Makefile
Use size_t in manpath instead of int.
[mandoc.git] / Makefile
index 014cc8d159402482541e851e14a1b18bb34b4a84..304237b47827c3e55f3a6af9c4f06defff8341ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@
 #
 # CFLAGS       += -DOSNAME="\"OpenBSD 4.5\""
 
-VERSION                 = 1.12.0
-VDATE           = 8 October 2011
+VERSION                 = 1.12.1
+VDATE           = 23 March 2012
 
 # IFF your system supports multi-byte functions (setlocale(), wcwidth(),
 # putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
@@ -27,14 +27,19 @@ CFLAGS              += -DUSE_WCHAR
 # system that's not OpenBSD or NetBSD.  If uncommented, apropos(1),
 # mandocdb(8), and man.cgi will popen(3) manpath(1) to get the MANPATH
 # variable.
-CFLAGS         += -DUSE_MANPATH
+#CFLAGS                += -DUSE_MANPATH
 
-# If your system doesn't support static binaries, comment this.
-#STATIC                 = -static
+# 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)\""
 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
+WWWPREFIX       = /var/www
+HTDOCDIR        = $(WWWPREFIX)/htdocs
+CGIBINDIR       = $(WWWPREFIX)/cgi-bin
 BINDIR          = $(PREFIX)/bin
 INCLUDEDIR      = $(PREFIX)/include/mandoc
 LIBDIR          = $(PREFIX)/lib/mandoc
@@ -59,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 \
@@ -92,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 \
@@ -105,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 \
@@ -147,6 +158,7 @@ SRCS                 = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
+                  test-fgetln.c \
                   test-getsubopt.c \
                   test-mmap.c \
                   test-strlcat.c \
@@ -154,7 +166,8 @@ SRCS                 = Makefile \
                   test-strptime.c \
                   tree.c \
                   vol.c \
-                  vol.in
+                  vol.in \
+                  whatis.1
 
 LIBMAN_OBJS     = man.o \
                   man_hash.o \
@@ -173,7 +186,6 @@ LIBMDOC_OBJS         = arch.o \
                   mdoc_hash.o \
                   mdoc_macro.o \
                   mdoc_validate.o \
-                  msec.o \
                   st.o \
                   vol.o
 LIBMDOC_LNS     = arch.ln \
@@ -184,7 +196,6 @@ LIBMDOC_LNS  = arch.ln \
                   mdoc_hash.ln \
                   mdoc_macro.ln \
                   mdoc_validate.ln \
-                  msec.ln \
                   st.ln \
                   vol.ln
 
@@ -206,18 +217,22 @@ LIBMANDOC_OBJS     = $(LIBMAN_OBJS) \
                   $(LIBROFF_OBJS) \
                   chars.o \
                   mandoc.o \
+                  msec.o \
                   read.o
 LIBMANDOC_LNS   = $(LIBMAN_LNS) \
                   $(LIBMDOC_LNS) \
                   $(LIBROFF_LNS) \
                   chars.ln \
                   mandoc.ln \
+                  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
 
@@ -321,7 +336,7 @@ $(CGI_OBJS) $(CGI_LNS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h
 CATMAN_OBJS     = catman.o manpath.o
 CATMAN_LNS      = catman.ln manpath.ln
 
-$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h 
+$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h mandocdb.h
 
 DEMANDOC_OBJS   = demandoc.o
 DEMANDOC_LNS    = demandoc.ln
@@ -333,6 +348,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 \
@@ -343,6 +363,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 \
@@ -358,6 +383,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 \
@@ -409,7 +439,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)
@@ -422,11 +452,16 @@ 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-strlcpy.DSYM
-       rm -rf test-strlcat.DSYM 
-       rm -rf test-strptime.DSYM 
-       rm -rf test-mmap.DSYM 
-       rm -rf test-getsubopt.DSYM
+       rm -rf test-fgetln.dSYM
+       rm -rf test-strlcpy.dSYM
+       rm -rf test-strlcat.dSYM 
+       rm -rf test-strptime.dSYM 
+       rm -rf test-mmap.dSYM 
+       rm -rf test-getsubopt.dSYM
+       rm -rf apropos.dSYM
+       rm -rf catman.dSYM
+       rm -rf mandocdb.dSYM
+       rm -rf whatis.dSYM
 
 install: all
        mkdir -p $(DESTDIR)$(BINDIR)
@@ -436,7 +471,6 @@ install: all
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       mkdir -p $(DESTDIR)$(MANDIR)/man8
        $(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
@@ -445,6 +479,13 @@ install: all
        $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
+installcgi: all
+       mkdir -p $(DESTDIR)$(CGIBINDIR)
+       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)
+
 installwww: www
        mkdir -p $(PREFIX)/snapshots
        mkdir -p $(PREFIX)/binaries
@@ -553,6 +594,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; \