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

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index aa3b29b740525c2cda90afcf123452869464b2dd..c535f105b9fa148fad355f195c66cd531a6e8876 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@
 # 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.11.2
-VDATE           = 12 May 2011
+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
 # 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


@@ -32,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 \


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

+                  preconv.1 \
+                  preconv.c \

                   predefs.in \
                   read.c \
                   roff.7 \
                   predefs.in \
                   read.c \
                   roff.7 \


@@ -106,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 \


@@ -268,6 +271,11 @@ INDEX_MANS  = makewhatis.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 \


@@ -290,7 +298,7 @@ INDEX_OBJS   = $(INDEX_MANS) \
 
 www: index.html
 
 
 www: index.html
 

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

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


@@ -313,10 +321,10 @@ install: all
        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_PROGRAM) mandoc preconv $(DESTDIR)$(BINDIR)

        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) mandoc.h $(DESTDIR)$(INCLUDEDIR)

-       $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(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)


@@ -375,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; \