summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2012-06-08 10:47:17 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2012-06-08 10:47:17 +0000
commitc5ab96fef3857d6878d16856c0d7bc3907a93a6e (patch)
tree0a47a12121f1358f4ed36e0ee43ed32195bbe434 /Makefile
parentb029b3cbf4ce3eeea06b12cda0ccf718b5c9218a (diff)
downloadmandoc-c5ab96fef3857d6878d16856c0d7bc3907a93a6e.tar.gz
Remove lint from Makefile.
Disable some parts of the build (man.cgi, etc.) while sqlite3 is being merged in nice and slow. Remove the bit swapping stuff in config.h.post. Remove apropos_db (replaced by mansearch).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile280
1 files changed, 41 insertions, 239 deletions
diff --git a/Makefile b/Makefile
index 304237b4..96832d5c 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,8 @@ VDATE = 23 March 2012
CFLAGS += -DUSE_WCHAR
# If your system has manpath(1), uncomment this. This is most any
-# 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.
+# system that's not OpenBSD or NetBSD. If uncommented, manpage(1) and
+# mandocdb(8) will use manpath(1) to get the MANPATH variable.
#CFLAGS += -DUSE_MANPATH
# If your system supports static binaries only, uncomment this. This
@@ -34,7 +33,7 @@ CFLAGS += -DUSE_WCHAR
# requires -pthreads for static libdb).
STATIC = -static
-CFLAGS += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
+CFLAGS += -I/usr/local/include -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
CFLAGS += -W -Wall -Wstrict-prototypes -Wno-unused-parameter -Wwrite-strings
PREFIX = /usr/local
WWWPREFIX = /var/www
@@ -52,29 +51,17 @@ INSTALL_LIB = $(INSTALL) -m 0644
INSTALL_SOURCE = $(INSTALL) -m 0644
INSTALL_MAN = $(INSTALL_DATA)
-# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
-# apropos.
-# However, if you don't have -ldb at all (or it's not native), then
-# comment out apropos and mandocdb.
-#
-#DBLIB = -ldb
-DBBIN = apropos mandocdb man.cgi catman whatis
-DBLN = llib-lapropos.ln llib-lmandocdb.ln llib-lman.cgi.ln llib-lcatman.ln
+DBLIB = -L/usr/local/lib -lsqlite3
+DBBIN = mandocdb manpage apropos
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 \
@@ -106,7 +93,6 @@ SRCS = Makefile \
main.h \
man.7 \
man.c \
- man.cgi.7 \
man-cgi.css \
man.h \
man_hash.c \
@@ -166,17 +152,12 @@ SRCS = Makefile \
test-strptime.c \
tree.c \
vol.c \
- vol.in \
- whatis.1
+ vol.in
LIBMAN_OBJS = man.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 \
@@ -188,16 +169,6 @@ LIBMDOC_OBJS = arch.o \
mdoc_validate.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 \
- st.ln \
- vol.ln
LIBROFF_OBJS = eqn.o \
roff.o \
@@ -205,12 +176,6 @@ LIBROFF_OBJS = eqn.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) \
@@ -219,52 +184,35 @@ LIBMANDOC_OBJS = $(LIBMAN_OBJS) \
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_fgetln.o \
compat_getsubopt.o \
compat_strlcat.o \
compat_strlcpy.o
-COMPAT_LNS = compat_fgetln.ln \
- compat_getsubopt.ln \
- compat_strlcat.ln \
- compat_strlcpy.ln
-
-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) $(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
-
-$(COMPAT_OBJS) $(COMPAT_LNS): config.h
+
+arch.o: arch.in
+att.o: att.in
+chars.o: chars.in
+lib.o: lib.in
+msec.o: msec.in
+roff.o: predefs.in
+st.o: st.in
+vol.o: vol.in
+
+$(LIBMAN_OBJS): libman.h
+$(LIBMDOC_OBJS): libmdoc.h
+$(LIBROFF_OBJS): libroff.h
+$(LIBMANDOC_OBJS): mandoc.h mdoc.h man.h libmandoc.h config.h
+$(COMPAT_OBJS): config.h
MANDOC_HTML_OBJS = eqn_html.o \
html.o \
man_html.o \
mdoc_html.o \
tbl_html.o
-MANDOC_HTML_LNS = eqn_html.ln \
- html.ln \
- man_html.ln \
- mdoc_html.ln \
- tbl_html.ln
+$(MANDOC_HTML_OBJS): html.h
MANDOC_MAN_OBJS = mdoc_man.o
-MANDOC_MAN_LNS = mdoc_man.ln
MANDOC_TERM_OBJS = eqn_term.o \
man_term.o \
@@ -273,13 +221,7 @@ MANDOC_TERM_OBJS = eqn_term.o \
term_ascii.o \
term_ps.o \
tbl_term.o
-MANDOC_TERM_LNS = eqn_term.ln \
- man_term.ln \
- mdoc_term.ln \
- term.ln \
- term_ascii.ln \
- term_ps.ln \
- tbl_term.ln
+$(MANDOC_TERM_OBJS): term.h
MANDOC_OBJS = $(MANDOC_HTML_OBJS) \
$(MANDOC_MAN_OBJS) \
@@ -287,73 +229,24 @@ MANDOC_OBJS = $(MANDOC_HTML_OBJS) \
main.o \
out.o \
tree.o
-MANDOC_LNS = $(MANDOC_HTML_LNS) \
- $(MANDOC_MAN_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
+$(MANDOC_OBJS): main.h mandoc.h mdoc.h man.h config.h out.h
MANDOCDB_OBJS = mandocdb.o manpath.o
-MANDOCDB_LNS = mandocdb.ln manpath.ln
-
-$(MANDOCDB_OBJS) $(MANDOCDB_LNS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h
+$(MANDOCDB_OBJS): mandocdb.h mandoc.h mdoc.h man.h config.h manpath.h
PRECONV_OBJS = preconv.o
-PRECONV_LNS = preconv.ln
-
-$(PRECONV_OBJS) $(PRECONV_LNS): config.h
-
-APROPOS_OBJS = apropos.o apropos_db.o manpath.o
-APROPOS_LNS = apropos.ln apropos_db.ln manpath.ln
-
-$(APROPOS_OBJS) $(APROPOS_LNS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
-
-CGI_OBJS = $(MANDOC_HTML_OBJS) \
- $(MANDOC_MAN_OBJS) \
- $(MANDOC_TERM_OBJS) \
- cgi.o \
- apropos_db.o \
- manpath.o \
- out.o \
- tree.o
-
-CGI_LNS = $(MANDOC_HTML_LNS) \
- $(MANDOC_MAN_LNS) \
- $(MANDOC_TERM_LNS) \
- cgi.ln \
- apropos_db.ln \
- manpath.ln \
- out.ln \
- tree.ln
-
-$(CGI_OBJS) $(CGI_LNS): main.h mdoc.h man.h out.h config.h mandoc.h apropos_db.h manpath.h mandocdb.h
+$(PRECONV_OBJS): config.h
-CATMAN_OBJS = catman.o manpath.o
-CATMAN_LNS = catman.ln manpath.ln
+APROPOS_OBJS = apropos.o mansearch.o manpath.o
+$(APROPOS_OBJS): config.h manpath.h mandocdb.h mansearch.h
-$(CATMAN_OBJS) $(CATMAN_LNS): config.h mandoc.h manpath.h mandocdb.h
+MANPAGE_OBJS = manpage.o mansearch.o manpath.o
+$(MANPAGE_OBJS): config.h manpath.h mandocdb.h mansearch.h
DEMANDOC_OBJS = demandoc.o
-DEMANDOC_LNS = demandoc.ln
-
-$(DEMANDOC_OBJS) $(DEMANDOC_LNS): config.h
-
-INDEX_MANS = apropos.1.html \
- apropos.1.xhtml \
- 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_OBJS): config.h
+
+INDEX_MANS = demandoc.1.html \
demandoc.1.xhtml \
demandoc.1.ps \
demandoc.1.pdf \
@@ -363,11 +256,6 @@ 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 \
@@ -383,11 +271,6 @@ 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 \
@@ -430,38 +313,18 @@ INDEX_OBJS = $(INDEX_MANS) \
www: index.html
-lint: llib-lmandoc.ln llib-lpreconv.ln llib-ldemandoc.ln $(DBLN)
-
clean:
rm -f libmandoc.a $(LIBMANDOC_OBJS)
- rm -f llib-llibmandoc.ln $(LIBMANDOC_LNS)
+ rm -f apropos $(APROPOS_OBJS)
rm -f mandocdb $(MANDOCDB_OBJS)
- rm -f llib-lmandocdb.ln $(MANDOCDB_LNS)
rm -f preconv $(PRECONV_OBJS)
- rm -f llib-lpreconv.ln $(PRECONV_LNS)
- 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)
- rm -f catman $(CATMAN_OBJS)
- rm -f llib-lcatman.ln $(CATMAN_LNS)
+ rm -f manpage $(MANPAGE_OBJS)
rm -f demandoc $(DEMANDOC_OBJS)
- rm -f llib-ldemandoc.ln $(DEMANDOC_LNS)
rm -f mandoc $(MANDOC_OBJS)
- rm -f llib-lmandoc.ln $(MANDOC_LNS)
- 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 config.h config.log $(COMPAT_OBJS)
+ rm -f mdocml.tar.gz
rm -f index.html $(INDEX_OBJS)
- 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
+ rm -rf *.dSYM
install: all
mkdir -p $(DESTDIR)$(BINDIR)
@@ -482,7 +345,7 @@ install: all
installcgi: all
mkdir -p $(DESTDIR)$(CGIBINDIR)
mkdir -p $(DESTDIR)$(HTDOCDIR)
- $(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
+ #$(INSTALL_PROGRAM) man.cgi $(DESTDIR)$(CGIBINDIR)
$(INSTALL_DATA) example.style.css $(DESTDIR)$(HTDOCDIR)/man.css
$(INSTALL_DATA) man-cgi.css $(DESTDIR)$(HTDOCDIR)
@@ -500,54 +363,24 @@ installwww: www
libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
-llib-llibmandoc.ln: $(COMPAT_LNS) $(LIBMANDOC_LNS)
- $(LINT) $(LINTFLAGS) -Clibmandoc $(COMPAT_LNS) $(LIBMANDOC_LNS)
-
mandoc: $(MANDOC_OBJS) libmandoc.a
$(CC) $(LDFLAGS) -o $@ $(MANDOC_OBJS) libmandoc.a
-llib-lmandoc.ln: $(MANDOC_LNS) llib-llibmandoc.ln
- $(LINT) $(LINTFLAGS) -Cmandoc $(MANDOC_LNS) llib-llibmandoc.ln
-
mandocdb: $(MANDOCDB_OBJS) libmandoc.a
$(CC) $(LDFLAGS) -o $@ $(MANDOCDB_OBJS) libmandoc.a $(DBLIB)
-llib-lmandocdb.ln: $(MANDOCDB_LNS) llib-llibmandoc.ln
- $(LINT) $(LINTFLAGS) -Cmandocdb $(MANDOCDB_LNS) llib-llibmandoc.ln
-
preconv: $(PRECONV_OBJS)
$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
-llib-lpreconv.ln: $(PRECONV_LNS) llib-llibmandoc.ln
- $(LINT) $(LINTFLAGS) -Cpreconv $(PRECONV_LNS) llib-llibmandoc.ln
-
-whatis: apropos
- cp -f apropos whatis
+manpage: $(MANPAGE_OBJS) libmandoc.a
+ $(CC) $(LDFLAGS) -o $@ $(MANPAGE_OBJS) libmandoc.a $(DBLIB)
apropos: $(APROPOS_OBJS) libmandoc.a
$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
-llib-lapropos.ln: $(APROPOS_LNS) llib-llibmandoc.ln
- $(LINT) $(LINTFLAGS) -Capropos $(APROPOS_LNS) llib-llibmandoc.ln
-
-catman: $(CATMAN_OBJS) libmandoc.a
- $(CC) $(LDFLAGS) -o $@ $(CATMAN_OBJS) libmandoc.a $(DBLIB)
-
-llib-lcatman.ln: $(CATMAN_LNS) llib-llibmandoc.ln
- $(LINT) $(LINTFLAGS) -Ccatman $(CATMAN_LNS) llib-llibmandoc.ln
-
-man.cgi: $(CGI_OBJS) libmandoc.a
- $(CC) $(LDFLAGS) $(STATIC) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
-
-llib-lman.cgi.ln: $(CGI_LNS) llib-llibmandoc.ln
- $(LINT) $(LINTFLAGS) -Cman.cgi $(CGI_LNS) llib-llibmandoc.ln
-
demandoc: $(DEMANDOC_OBJS) libmandoc.a
$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
-llib-ldemandoc.ln: $(DEMANDOC_LNS) llib-llibmandoc.ln
- $(LINT) $(LINTFLAGS) -Cdemandoc $(DEMANDOC_LNS) llib-llibmandoc.ln
-
mdocml.md5: mdocml.tar.gz
md5 mdocml.tar.gz >$@
@@ -557,37 +390,6 @@ mdocml.tar.gz: $(SRCS)
( cd .dist/ && tar zcf ../$@ ./ )
rm -rf .dist/
-mdocml-win32.zip: $(SRCS)
- mkdir -p .win32/mdocml-$(VERSION)/
- $(INSTALL_SOURCE) $(SRCS) .win32
- cp .win32/Makefile .win32/Makefile.old
- egrep -v -e DUSE_WCHAR -e ^DBBIN .win32/Makefile.old >.win32/Makefile
- ( cd .win32; \
- CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \
- make install PREFIX=mdocml-$(VERSION) ; \
- zip -r ../$@ mdocml-$(VERSION) )
- rm -rf .win32
-
-mdocml-win64.zip: $(SRCS)
- mkdir -p .win64/mdocml-$(VERSION)/
- $(INSTALL_SOURCE) $(SRCS) .win64
- cp .win64/Makefile .win64/Makefile.old
- egrep -v -e DUSE_WCHAR -e ^DBBIN .win64/Makefile.old >.win64/Makefile
- ( cd .win64; \
- CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-ar CFLAGS='-DOSNAME=\"Windows\"' make; \
- make install PREFIX=mdocml-$(VERSION) ; \
- zip -r ../$@ mdocml-$(VERSION) )
- rm -rf .win64
-
-mdocml-macosx.zip: $(SRCS)
- mkdir -p .macosx/mdocml-$(VERSION)/
- $(INSTALL_SOURCE) $(SRCS) .macosx
- ( cd .macosx; \
- CFLAGS="-arch i386 -arch x86_64 -arch ppc" LDFLAGS="-arch i386 -arch x86_64 -arch ppc" make; \
- make install PREFIX=mdocml-$(VERSION) ; \
- zip -r ../$@ mdocml-$(VERSION) )
- rm -rf .macosx
-
index.html: $(INDEX_OBJS)
config.h: config.h.pre config.h.post