*** empty log message ***

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 2e1ed7d13210bf375012e9584716024c11e47fcf..05c8890d4bc2878d88548de3c3f5cd2502ae827b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,44 +9,60 @@ INSTALL_DATA  = install -m 0444
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 
 INSTALL_LIB    = install -m 0644
 INSTALL_MAN    = $(INSTALL_DATA)
 

-VERSION           = 1.6.6
-VDATE     = 21 March 2009
+VERSION           = 1.7.8
+VDATE     = 31 March 2009

 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"

-CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g 
+CFLAGS    += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -g

 LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
 
 LINTFLAGS += $(VFLAGS)
 CFLAGS    += $(VFLAGS)
 

-LIBLNS    = macro.ln mdoc.ln hash.ln strings.ln xstd.ln argv.ln \
-            validate.ln action.ln lib.ln att.ln arch.ln vol.ln \
-            msec.ln st.ln
-LIBOBJS           = macro.o mdoc.o hash.o strings.o xstd.o argv.o validate.o \
-            action.o lib.o att.o arch.o vol.o msec.o st.o
-LIBSRCS           = macro.c mdoc.c hash.c strings.c xstd.c argv.c validate.c \
-            action.c lib.c att.c arch.c vol.c msec.c st.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
-
-LLNS      = llib-llibmdoc.ln llib-lmandoc.ln
-LNS       = $(MAINLNS) $(LIBLNS)
-LIBS      = libmdoc.a
-OBJS      = $(LIBOBJS) $(MAINOBJS)
-SRCS      = $(LIBSRCS) $(MAINSRCS)
+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) $(MANLNS)
+LIBS      = libmdoc.a libman.a
+OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
+SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)

 DATAS     = arch.in att.in lib.in msec.in st.in vol.in ascii.in
 DATAS     = arch.in att.in lib.in msec.in st.in vol.in ascii.in

-HEADS     = mdoc.h private.h term.h 
-SGMLS     = index.sgml
+HEADS     = mdoc.h libmdoc.h man.h libman.h term.h 
+SGMLS     = index.sgml 

 HTMLS     = index.html
 STATICS           = style.css external.png
 TARGZS    = mdocml-$(VERSION).tar.gz \
             mdocml-oport-$(VERSION).tar.gz \
 HTMLS     = index.html
 STATICS           = style.css external.png
 TARGZS    = mdocml-$(VERSION).tar.gz \
             mdocml-oport-$(VERSION).tar.gz \

+            mdocml-fport-$(VERSION).tar.gz \

             mdocml-nport-$(VERSION).tar.gz
             mdocml-nport-$(VERSION).tar.gz

-MANS      = mandoc.1 mdoc.3 mdoc.7
+MANS      = mandoc.1 mdoc.3 mdoc.7 manuals.7

 BINS      = mandoc
 BINS      = mandoc

-CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) 
-INSTALL           = $(SRCS) $(HEADS) Makefile DESCR $(MANS) $(SGMLS) \
-            $(STATICS) Makefile.netbsd Makefile.openbsd $(DATAS)
+CLEAN     = $(BINS) $(LNS) $(LLNS) $(LIBS) $(OBJS) $(HTMLS) $(TARGZS) \
+            tags
+MAKEFILES  = Makefile.netbsd Makefile.openbsd Makefile.freebsd \
+            Makefile
+INSTALL           = $(SRCS) $(HEADS) $(MAKEFILES) DESCR $(MANS) $(SGMLS) \
+            $(STATICS) $(DATAS)

 
 all:   $(BINS)
 
 
 all:   $(BINS)
 


@@ -60,7 +76,9 @@ cleanlint:
 
 dist:  mdocml-$(VERSION).tar.gz
 
 
 dist:  mdocml-$(VERSION).tar.gz
 

-port:  mdocml-oport-$(VERSION).tar.gz mdocml-nport-$(VERSION).tar.gz
+port:  mdocml-oport-$(VERSION).tar.gz \
+       mdocml-fport-$(VERSION).tar.gz \
+       mdocml-nport-$(VERSION).tar.gz

 
 www:   $(HTMLS) $(TARGZS)
 
 
 www:   $(HTMLS) $(TARGZS)
 


@@ -72,6 +90,8 @@ installwww: www
        install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
        install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
        install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz
        install -m 0444 mdocml-oport-$(VERSION).tar.gz $(PREFIX)/ports-openbsd/mdocml.tar.gz
        install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/
        install -m 0444 mdocml-nport-$(VERSION).tar.gz $(PREFIX)/ports-netbsd/mdocml.tar.gz

+       install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/
+       install -m 0444 mdocml-fport-$(VERSION).tar.gz $(PREFIX)/ports-freebsd/mdocml.tar.gz

 
 install:
        mkdir -p $(BINDIR)
 
 install:
        mkdir -p $(BINDIR)


@@ -86,63 +106,70 @@ uninstall:
        rm -f $(MANDIR)/man1/mandoc.1
        rm -f $(MANDIR)/man7/mdoc.7
 
        rm -f $(MANDIR)/man1/mandoc.1
        rm -f $(MANDIR)/man7/mdoc.7
 

-lib.ln: lib.c lib.in private.h
-lib.o: lib.c lib.in private.h
+man_macro.ln: man_macro.c libman.h
+man_macro.o: man_macro.c libman.h

 
 

-att.ln: att.c att.in private.h
-att.o: att.c att.in private.h
+lib.ln: lib.c lib.in libmdoc.h
+lib.o: lib.c lib.in libmdoc.h

 
 

-arch.ln: arch.c arch.in private.h
-arch.o: arch.c arch.in private.h
+att.ln: att.c att.in libmdoc.h
+att.o: att.c att.in libmdoc.h

 
 

-vol.ln: vol.c vol.in private.h
-vol.o: vol.c vol.in private.h
+arch.ln: arch.c arch.in libmdoc.h
+arch.o: arch.c arch.in libmdoc.h
+
+vol.ln: vol.c vol.in libmdoc.h
+vol.o: vol.c vol.in libmdoc.h

 
 ascii.ln: ascii.c ascii.in term.h
 ascii.o: ascii.c ascii.in term.h
 
 
 ascii.ln: ascii.c ascii.in term.h
 ascii.o: ascii.c ascii.in term.h
 

-msec.ln: msec.c msec.in private.h
-msec.o: msec.c msec.in private.h
+msec.ln: msec.c msec.in libmdoc.h
+msec.o: msec.c msec.in libmdoc.h
+
+st.ln: st.c st.in libmdoc.h
+st.o: st.c st.in libmdoc.h
+
+mdoc_macro.ln: mdoc_macro.c libmdoc.h
+mdoc_macro.o: mdoc_macro.c libmdoc.h

 
 

-st.ln: st.c st.in private.h
-st.o: st.c st.in private.h
+mdoc_term.ln: mdoc_term.c term.h mdoc.h
+mdoc_term.o: mdoc_term.c term.h mdoc.h

 
 

-macro.ln: macro.c private.h
-macro.o: macro.c private.h
+mdoc_strings.ln: mdoc_strings.c libmdoc.h
+mdoc_strings.o: mdoc_strings.c libmdoc.h

 
 

-term.ln: term.c term.h 
-term.o: term.c term.h
+man_hash.ln: man_hash.c libman.h
+man_hash.o: man_hash.c libman.h

 
 

-strings.ln: strings.c private.h
-strings.o: strings.c private.h
+mdoc_hash.ln: mdoc_hash.c libmdoc.h
+mdoc_hash.o: mdoc_hash.c libmdoc.h

 
 

-hash.ln: hash.c private.h
-hash.o: hash.c private.h
+mdoc.ln: mdoc.c libmdoc.h
+mdoc.o: mdoc.c libmdoc.h

 
 

-mdoc.ln: mdoc.c private.h
-mdoc.o: mdoc.c private.h
+man.ln: man.c libman.h
+man.o: man.c libman.h

 
 main.ln: main.c mdoc.h
 main.o: main.c mdoc.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 private.h
-xstd.o: xstd.c private.h
+mdoc_argv.ln: mdoc_argv.c libmdoc.h
+mdoc_argv.o: mdoc_argv.c libmdoc.h

 
 

-argv.ln: argv.c private.h
-argv.o: argv.c private.h
+man_validate.ln: man_validate.c libman.h
+man_validate.o: man_validate.c libman.h

 
 

-validate.ln: validate.c private.h
-validate.o: validate.c private.h
+mdoc_validate.ln: mdoc_validate.c libmdoc.h
+mdoc_validate.o: mdoc_validate.c libmdoc.h

 
 

-action.ln: action.c private.h
-action.o: action.c private.h
+mdoc_action.ln: mdoc_action.c libmdoc.h
+mdoc_action.o: mdoc_action.c libmdoc.h

 
 

-private.h: mdoc.h
-
-term.h: mdoc.h
+libmdoc.h: mdoc.h

 
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
        mkdir -p .dist/mdocml/
 
 mdocml-nport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.netbsd DESCR
        mkdir -p .dist/mdocml/


@@ -174,23 +201,43 @@ mdocml-oport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.openbsd DESCR
        ( cd .dist/ && tar zcf ../$@ mdocml/ )
        rm -rf .dist/
 
        ( cd .dist/ && tar zcf ../$@ mdocml/ )
        rm -rf .dist/
 

+mdocml-fport-$(VERSION).tar.gz: mdocml-$(VERSION).tar.gz Makefile.freebsd DESCR
+       mkdir -p .dist/mdocml
+       sed -e "s!@VERSION@!$(VERSION)!" Makefile.freebsd > \
+               .dist/mdocml/Makefile
+       ( md5 mdocml-$(VERSION).tar.gz; \
+         cksum -a SHA256 mdocml-$(VERSION).tar.gz; \
+         echo -n "SIZE (mdocml-$(VERSION).tar.gz) = "; \
+         ls -l mdocml-$(VERSION).tar.gz | awk '{print $$5}' \
+         ) > .dist/mdocml/distinfo
+       install -m 0644 DESCR .dist/mdocml/pkg-descr
+       ( echo; echo "WWW: http://mdocml.bsd.lv/") >> .dist/mdocml/pkg-descr
+       ( cd .dist/ && tar zcf ../$@ mdocml/ )
+       rm -rf .dist/
+

 mdocml-$(VERSION).tar.gz: $(INSTALL)
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
        install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 
 mdocml-$(VERSION).tar.gz: $(INSTALL)
        mkdir -p .dist/mdocml/mdocml-$(VERSION)/
        install -m 0644 $(INSTALL) .dist/mdocml/mdocml-$(VERSION)/
        ( cd .dist/mdocml/ && tar zcf ../../$@ mdocml-$(VERSION)/ )
        rm -rf .dist/
 

-llib-llibmdoc.ln: $(LIBLNS)
-       $(LINT) $(LINTFLAGS) -Clibmdoc $(LIBLNS)
+llib-llibmdoc.ln: $(MDOCLNS)
+       $(LINT) $(LINTFLAGS) -Clibmdoc $(MDOCLNS)
+
+llib-llibman.ln: $(MANLNS)
+       $(LINT) $(LINTFLAGS) -Clibman $(MANLNS)

 
 llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
        $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
 
 
 llib-lmandoc.ln: $(MAINLNS) llib-llibmdoc.ln
        $(LINT) $(LINTFLAGS) -Cmandoc $(MAINLNS) llib-llibmdoc.ln
 

-libmdoc.a: $(LIBOBJS)
-       $(AR) rs $@ $(LIBOBJS)
+libmdoc.a: $(MDOCOBJS)
+       $(AR) rs $@ $(MDOCOBJS)
+
+libman.a: $(MANOBJS)
+       $(AR) rs $@ $(MANOBJS)

 
 

-mandoc: $(MAINOBJS) libmdoc.a
-       $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a 
+mandoc: $(MAINOBJS) libmdoc.a libman.a
+       $(CC) $(CFLAGS) -o $@ $(MAINOBJS) libmdoc.a libman.a

 
 .sgml.html:
        validate $<
 
 .sgml.html:
        validate $<