*** empty log message ***

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index d6e3a04dfe685ed41f4b3b144eee822d6132f93e..05c8890d4bc2878d88548de3c3f5cd2502ae827b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,36 +9,42 @@ INSTALL_DATA  = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
-VERSION           = 1.7.3
-VDATE     = 24 March 2009
+VERSION           = 1.7.8
+VDATE     = 31 March 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g
 LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
 
-MDOCLNS           = mdoc_macro.ln mdoc.ln mdoc_hash.ln strings.ln xstd.ln \
-            argv.ln mdoc_validate.ln action.ln lib.ln att.ln \
-            arch.ln vol.ln msec.ln st.ln
-MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o strings.o xstd.o argv.o \
-            mdoc_validate.o action.o lib.o att.o arch.o vol.o \
-            msec.o st.o
-MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c strings.c xstd.c argv.c \
-            mdoc_validate.c action.c lib.c att.c arch.c vol.c \
-            msec.c st.c
-
-MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln
-MANOBJS           = man_macro.o man.o man_hash.o man_validate.o
-MANSRCS           = man_macro.c man.c man_hash.c man_validate.c
-
-MAINLNS           = main.ln term.ln ascii.ln terminal.ln tree.ln compat.ln
-MAINOBJS   = main.o term.o ascii.o terminal.o tree.o compat.o
-MAINSRCS   = main.c term.c ascii.c terminal.c tree.c compat.c
+MDOCLNS           = mdoc_macro.ln mdoc.ln mdoc_hash.ln mdoc_strings.ln \
+            mdoc_argv.ln mdoc_validate.ln mdoc_action.ln \
+            lib.ln att.ln arch.ln vol.ln msec.ln st.ln
+MDOCOBJS   = mdoc_macro.o mdoc.o mdoc_hash.o mdoc_strings.o \
+            mdoc_argv.o mdoc_validate.o mdoc_action.o lib.o att.o \
+            arch.o vol.o msec.o st.o
+MDOCSRCS   = mdoc_macro.c mdoc.c mdoc_hash.c mdoc_strings.c \
+            mdoc_argv.c mdoc_validate.c mdoc_action.c lib.c att.c \
+            arch.c vol.c msec.c st.c
+
+MANLNS    = man_macro.ln man.ln man_hash.ln man_validate.ln \
+            man_action.ln
+MANOBJS           = man_macro.o man.o man_hash.o man_validate.o \
+            man_action.o
+MANSRCS           = man_macro.c man.c man_hash.c man_validate.c \
+            man_action.c
+
+MAINLNS           = main.ln mdoc_term.ln ascii.ln term.ln tree.ln \
+            compat.ln man_term.ln
+MAINOBJS   = main.o mdoc_term.o ascii.o term.o tree.o compat.o \
+            man_term.o
+MAINSRCS   = main.c mdoc_term.c ascii.c term.c tree.c compat.c \
+            man_term.c
 
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
-LNS       = $(MAINLNS) $(MDOCLNS)
+LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS)
 LIBS      = libmdoc.a libman.a
-OBJS      = $(MDOCOBJS) $(MAINOBJS)
+OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
 SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
 DATAS     = arch.in att.in lib.in msec.in st.in vol.in ascii.in
 HEADS     = mdoc.h libmdoc.h man.h libman.h term.h 
@@ -51,7 +57,8 @@ TARGZS           = mdocml-$(VERSION).tar.gz \
             mdocml-nport-$(VERSION).tar.gz
 MANS      = mandoc.1 mdoc.3 mdoc.7 manuals.7
 BINS      = mandoc
-CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
+CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) \
+            tags
 MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
             Makefile
 INSTALL           = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
@@ -126,11 +133,11 @@ st.o: st.c st.in libmdoc.h
 mdoc_macro.ln: mdoc_macro.c libmdoc.h
 mdoc_macro.o: mdoc_macro.c libmdoc.h
 
-term.ln: term.c term.h 
-term.o: term.c term.h
+mdoc_term.ln: mdoc_term.c term.h mdoc.h
+mdoc_term.o: mdoc_term.c term.h mdoc.h
 
-strings.ln: strings.c libmdoc.h
-strings.o: strings.c libmdoc.h
+mdoc_strings.ln: mdoc_strings.c libmdoc.h
+mdoc_strings.o: mdoc_strings.c libmdoc.h
 
 man_hash.ln: man_hash.c libman.h
 man_hash.o: man_hash.c libman.h
@@ -147,14 +154,11 @@ man.o: man.c libman.h
 main.ln: main.c mdoc.h
 main.o: main.c mdoc.h
 
-terminal.ln: terminal.c term.h
-terminal.o: terminal.c term.h
+term.ln: term.c term.h man.h mdoc.h
+term.o: term.c term.h man.h mdoc.h
 
-xstd.ln: xstd.c libmdoc.h
-xstd.o: xstd.c libmdoc.h
-
-argv.ln: argv.c libmdoc.h
-argv.o: argv.c libmdoc.h
+mdoc_argv.ln: mdoc_argv.c libmdoc.h
+mdoc_argv.o: mdoc_argv.c libmdoc.h
 
 man_validate.ln: man_validate.c libman.h
 man_validate.o: man_validate.c libman.h
@@ -162,13 +166,11 @@ man_validate.o: man_validate.c libman.h
 mdoc_validate.ln: mdoc_validate.c libmdoc.h
 mdoc_validate.o: mdoc_validate.c libmdoc.h
 
-action.ln: action.c libmdoc.h
-action.o: action.c libmdoc.h
+mdoc_action.ln: mdoc_action.c libmdoc.h
+mdoc_action.o: mdoc_action.c libmdoc.h
 
 libmdoc.h: mdoc.h
 
-term.h: mdoc.h
-
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
        mkdir -p .dist/mdocml/
        sed -e "s!@VERSION@!$(VERSION)!" Makefile.netbsd > \