Add back in a check that the leading `-' exists for arguments. This

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 7f619478907e55857637441050a9867ec4974687..c535f105b9fa148fad355f195c66cd531a6e8876 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,14 +11,19 @@
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS       += -DOSNAME="\"OpenBSD 4.5\""
 
 # in the lower-left hand corner of -mdoc manuals.
 # CFLAGS       += -DOSNAME="\"OpenBSD 4.5\""
 

-VERSION                 = 1.10.10
-VDATE           = 20 March 2011
-CFLAGS         += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+VERSION                 = 1.11.3
+VDATE           = 26 May 2011
+# IFF your system supports multi-byte functions (setlocale(), wcwidth(),
+# putwchar()) AND has __STDC_ISO_10646__ (that is, wchar_t is simply a
+# UCS-4 value) should you define USE_WCHAR.  If you define it and your
+# system DOESN'T support this, -Tlocale will produce garbage.
+# If you don't define it, -Tlocale is a synonym for -Tacsii.
+CFLAGS         += -g -DUSE_WCHAR -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""

 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
 BINDIR          = $(PREFIX)/bin
 CFLAGS         += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
 PREFIX          = /usr/local
 BINDIR          = $(PREFIX)/bin

-INCLUDEDIR      = $(PREFIX)/include
-LIBDIR          = $(PREFIX)/lib
+INCLUDEDIR      = $(PREFIX)/include/mandoc
+LIBDIR          = $(PREFIX)/lib/mandoc

 MANDIR          = $(PREFIX)/man
 EXAMPLEDIR      = $(PREFIX)/share/examples/mandoc
 INSTALL                 = install
 MANDIR          = $(PREFIX)/man
 EXAMPLEDIR      = $(PREFIX)/share/examples/mandoc
 INSTALL                 = install


@@ -27,7 +32,7 @@ INSTALL_DATA   = $(INSTALL) -m 0444
 INSTALL_LIB     = $(INSTALL) -m 0644
 INSTALL_MAN     = $(INSTALL_DATA)
 
 INSTALL_LIB     = $(INSTALL) -m 0644
 INSTALL_MAN     = $(INSTALL_DATA)
 

-all: mandoc
+all: mandoc preconv

 
 SRCS            = Makefile \
                   arch.c \
 
 SRCS            = Makefile \
                   arch.c \


@@ -55,9 +60,9 @@ SRCS           = Makefile \
                   libroff.h \
                   main.c \
                   main.h \
                   libroff.h \
                   main.c \
                   main.h \

+                  man.h \

                   man.7 \
                   man.c \
                   man.7 \
                   man.c \

-                  man_argv.c \

                   man_hash.c \
                   man_html.c \
                   man_macro.c \
                   man_hash.c \
                   man_html.c \
                   man_macro.c \


@@ -67,7 +72,10 @@ SRCS          = Makefile \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \
                   mandoc.3 \
                   mandoc.c \
                   mandoc.h \

+                  makewhatis.1 \
+                  makewhatis.c \

                   mandoc_char.7 \
                   mandoc_char.7 \

+                  mdoc.h \

                   mdoc.7 \
                   mdoc.c \
                   mdoc_argv.c \
                   mdoc.7 \
                   mdoc.c \
                   mdoc_argv.c \


@@ -80,6 +88,9 @@ SRCS           = Makefile \
                   msec.in \
                   out.c \
                   out.h \
                   msec.in \
                   out.c \
                   out.h \

+                  preconv.1 \
+                  preconv.c \
+                  predefs.in \

                   read.c \
                   roff.7 \
                   roff.c \
                   read.c \
                   roff.7 \
                   roff.c \


@@ -97,6 +108,7 @@ SRCS          = Makefile \
                   term.h \
                   term_ascii.c \
                   term_ps.c \
                   term.h \
                   term_ascii.c \
                   term_ps.c \

+                  test-mmap.c \

                   test-strlcat.c \
                   test-strlcpy.c \
                   tree.c \
                   test-strlcat.c \
                   test-strlcpy.c \
                   tree.c \


@@ -104,10 +116,14 @@ SRCS               = Makefile \
                   vol.in
 
 LIBMAN_OBJS     = man.o \
                   vol.in
 
 LIBMAN_OBJS     = man.o \

-                  man_argv.o \

                   man_hash.o \
                   man_macro.o \
                   man_validate.o
                   man_hash.o \
                   man_macro.o \
                   man_validate.o

+LIBMAN_LNS      = man.ln \
+                  man_hash.ln \
+                  man_macro.ln \
+                  man_validate.ln
+

 LIBMDOC_OBJS    = arch.o \
                   att.o \
                   lib.o \
 LIBMDOC_OBJS    = arch.o \
                   att.o \
                   lib.o \


@@ -119,56 +135,113 @@ LIBMDOC_OBJS      = arch.o \
                   msec.o \
                   st.o \
                   vol.o
                   msec.o \
                   st.o \
                   vol.o

+LIBMDOC_LNS     = arch.ln \
+                  att.ln \
+                  lib.ln \
+                  mdoc.ln \
+                  mdoc_argv.ln \
+                  mdoc_hash.ln \
+                  mdoc_macro.ln \
+                  mdoc_validate.ln \
+                  msec.ln \
+                  st.ln \
+                  vol.ln
+

 LIBROFF_OBJS    = eqn.o \
                   roff.o \
                   tbl.o \
                   tbl_data.o \
                   tbl_layout.o \
                   tbl_opts.o
 LIBROFF_OBJS    = eqn.o \
                   roff.o \
                   tbl.o \
                   tbl_data.o \
                   tbl_layout.o \
                   tbl_opts.o

+LIBROFF_LNS     = eqn.ln \
+                  roff.ln \
+                  tbl.ln \
+                  tbl_data.ln \
+                  tbl_layout.ln \
+                  tbl_opts.ln
+

 LIBMANDOC_OBJS  = $(LIBMAN_OBJS) \
                   $(LIBMDOC_OBJS) \
                   $(LIBROFF_OBJS) \
 LIBMANDOC_OBJS  = $(LIBMAN_OBJS) \
                   $(LIBMDOC_OBJS) \
                   $(LIBROFF_OBJS) \

+                  chars.o \

                   mandoc.o \
                   read.o
                   mandoc.o \
                   read.o

+LIBMANDOC_LNS   = $(LIBMAN_LNS) \
+                  $(LIBMDOC_LNS) \
+                  $(LIBROFF_LNS) \
+                  chars.ln \
+                  mandoc.ln \
+                  read.ln

 
 

-arch.o: arch.in
-att.o: att.in
-lib.o: lib.in
-msec.o: msec.in
-st.o: st.in
-vol.o: vol.in
+arch.o arch.ln: arch.in
+att.o att.ln: att.in
+chars.o chars.ln: chars.in
+lib.o lib.ln: lib.in
+msec.o msec.ln: msec.in
+roff.o roff.ln: predefs.in
+st.o st.ln: st.in
+vol.o vol.ln: vol.in

 
 

-$(LIBMAN_OBJS): libmdoc.h
-$(LIBMDOC_OBJS): libmdoc.h
-$(LIBROFF_OBJS): libroff.h
-$(LIBMANDOC_OBJS): mandoc.h libmandoc.h config.h
+$(LIBMAN_OBJS) $(LIBMAN_LNS): libman.h
+$(LIBMDOC_OBJS) $(LIBMDOC_LNS): libmdoc.h
+$(LIBROFF_OBJS) $(LIBROFF_LNS): libroff.h
+$(LIBMANDOC_OBJS) $(LIBMANDOC_LNS): mandoc.h mdoc.h man.h libmandoc.h config.h

 
 MANDOC_HTML_OBJS = html.o \
                   man_html.o \
                   mdoc_html.o \
                   tbl_html.o
 
 MANDOC_HTML_OBJS = html.o \
                   man_html.o \
                   mdoc_html.o \
                   tbl_html.o

+MANDOC_HTML_LNS         = html.ln \
+                  man_html.ln \
+                  mdoc_html.ln \
+                  tbl_html.ln
+

 MANDOC_TERM_OBJS = man_term.o \
                   mdoc_term.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \
                   tbl_term.o
 MANDOC_TERM_OBJS = man_term.o \
                   mdoc_term.o \
                   term.o \
                   term_ascii.o \
                   term_ps.o \
                   tbl_term.o

+MANDOC_TERM_LNS         = man_term.ln \
+                  mdoc_term.ln \
+                  term.ln \
+                  term_ascii.ln \
+                  term_ps.ln \
+                  tbl_term.ln
+

 MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_TERM_OBJS) \
 MANDOC_OBJS     = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_TERM_OBJS) \

-                  chars.o \

                   main.o \
                   out.o \
                   tree.o
                   main.o \
                   out.o \
                   tree.o

+MANDOC_LNS      = $(MANDOC_HTML_LNS) \
+                  $(MANDOC_TERM_LNS) \
+                  main.ln \
+                  out.ln \
+                  tree.ln
+
+$(MANDOC_HTML_OBJS) $(MANDOC_HTML_LNS): html.h
+$(MANDOC_TERM_OBJS) $(MANDOC_TERM_LNS): term.h
+$(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
+
+compat.o compat.ln: config.h

 
 

-chars.o: chars.in
+MAKEWHATIS_OBJS         = makewhatis.o
+MAKEWHATIS_LNS  = makewhatis.ln

 
 

-$(MANDOC_HTML_OBJS): html.h
-$(MANDOC_TERM_OBJS): term.h
-$(MANDOC_OBJS): main.h mandoc.h config.h out.h
+$(MAKEWHATIS_OBJS) $(MAKEWHATIS_LNS): mandoc.h mdoc.h man.h config.h

 
 

-compat.o: config.h
+PRECONV_OBJS    = preconv.o
+PRECONV_LNS     = preconv.ln

 
 

-INDEX_MANS      = mandoc.1.html \
+$(PRECONV_OBJS) $(PRECONV_LNS): config.h
+
+INDEX_MANS      = makewhatis.1.html \
+                  makewhatis.1.xhtml \
+                  makewhatis.1.ps \
+                  makewhatis.1.pdf \
+                  makewhatis.1.txt \
+                  mandoc.1.html \

                   mandoc.1.xhtml \
                   mandoc.1.ps \
                   mandoc.1.pdf \
                   mandoc.1.xhtml \
                   mandoc.1.ps \
                   mandoc.1.pdf \


@@ -198,6 +271,11 @@ INDEX_MANS  = mandoc.1.html \
                   mdoc.7.ps \
                   mdoc.7.pdf \
                   mdoc.7.txt \
                   mdoc.7.ps \
                   mdoc.7.pdf \
                   mdoc.7.txt \

+                  preconv.1.html \
+                  preconv.1.xhtml \
+                  preconv.1.ps \
+                  preconv.1.pdf \
+                  preconv.1.txt \

                   roff.7.html \
                   roff.7.xhtml \
                   roff.7.ps \
                   roff.7.html \
                   roff.7.xhtml \
                   roff.7.ps \


@@ -220,22 +298,33 @@ INDEX_OBJS         = $(INDEX_MANS) \
 
 www: index.html
 
 
 www: index.html
 

+lint: llib-llibmandoc.ln llib-lmandoc.ln llib-lpreconv.ln
+

 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS)
 clean:
        rm -f libmandoc.a $(LIBMANDOC_OBJS)

+       rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)
+       rm -f makewhatis $(MAKEWHATIS_OBJS)
+       rm -f llib-lmakewhatis.ln $(MAKEWHATIS_LNS)
+       rm -f preconv $(PRECONV_OBJS)
+       rm -f llib-lpreconv.ln $(PRECONV_LNS)

        rm -f mandoc $(MANDOC_OBJS)
        rm -f mandoc $(MANDOC_OBJS)

-       rm -f config.h compat.o config.log
+       rm -f llib-lmandoc.ln $(MANDOC_LNS)
+       rm -f config.h config.log compat.o compat.ln

        rm -f mdocml.tar.gz
        rm -f index.html $(INDEX_OBJS)
 
 install: all
        mkdir -p $(DESTDIR)$(BINDIR)
        mkdir -p $(DESTDIR)$(EXAMPLEDIR)
        rm -f mdocml.tar.gz
        rm -f index.html $(INDEX_OBJS)
 
 install: all
        mkdir -p $(DESTDIR)$(BINDIR)
        mkdir -p $(DESTDIR)$(EXAMPLEDIR)

+       mkdir -p $(DESTDIR)$(LIBDIR)
+       mkdir -p $(DESTDIR)$(INCLUDEDIR)

        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man7

-       $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
-       $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)/
-       $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(INSTALL_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)
+       $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
+       $(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR)
+       $(INSTALL_MAN) mandoc.1 preconv.1 $(DESTDIR)$(MANDIR)/man1

        $(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3
        $(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)
        $(INSTALL_MAN) mandoc.3 $(DESTDIR)$(MANDIR)/man3
        $(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)


@@ -253,9 +342,28 @@ installwww: www
 libmandoc.a: compat.o $(LIBMANDOC_OBJS)
        $(AR) rs $@ compat.o $(LIBMANDOC_OBJS)
 
 libmandoc.a: compat.o $(LIBMANDOC_OBJS)
        $(AR) rs $@ compat.o $(LIBMANDOC_OBJS)
 

+llib-llibmandoc.ln: compat.ln $(LIBMANDOC_LNS)
+       $(LINT) $(LINTFLAGS) -Clibmandoc compat.ln $(LIBMANDOC_LNS)
+

 mandoc: $(MANDOC_OBJS) libmandoc.a
        $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
 
 mandoc: $(MANDOC_OBJS) libmandoc.a
        $(CC) -o $@ $(MANDOC_OBJS) libmandoc.a
 

+llib-lmandoc.ln: $(MANDOC_LNS)
+       $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS)
+
+# You'll need -ldb for Linux.
+makewhatis: $(MAKEWHATIS_OBJS) libmandoc.a
+       $(CC) -o $@ $(MAKEWHATIS_OBJS) libmandoc.a
+
+llib-lmakewhatis.ln: $(MAKEWHATIS_LNS)
+       $(LINT) $(LINTFLAGS) -Cmakewhatis $(MAKEWHATIS_LNS)
+
+preconv: $(PRECONV_OBJS)
+       $(CC) -o $@ $(PRECONV_OBJS)
+
+llib-lpreconv.ln: $(PRECONV_LNS)
+       $(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS)
+

 mdocml.md5: mdocml.tar.gz
        md5 mdocml.tar.gz >$@
 
 mdocml.md5: mdocml.tar.gz
        md5 mdocml.tar.gz >$@
 


@@ -275,6 +383,10 @@ config.h: config.h.pre config.h.post
                echo '#define HAVE_STRLCAT'; \
                rm test-strlcat; \
          fi; \
                echo '#define HAVE_STRLCAT'; \
                rm test-strlcat; \
          fi; \

+         if $(CC) $(CFLAGS) -Werror -o test-mmap test-mmap.c >> config.log 2>&1; then \
+               echo '#define HAVE_MMAP'; \
+               rm test-mmap; \
+         fi; \

          if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
                echo '#define HAVE_STRLCPY'; \
                rm test-strlcpy; \
          if $(CC) $(CFLAGS) -Werror -o test-strlcpy test-strlcpy.c >> config.log 2>&1; then \
                echo '#define HAVE_STRLCPY'; \
                rm test-strlcpy; \