From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Adjust Makefile for manpath.{c,h} linking.
Date: Wed, 23 Nov 2011 04:56:17 -0500 (EST) [thread overview]
Message-ID: <201111230956.pAN9uHIc002714@krisdoz.my.domain> (raw)
Log Message:
-----------
Adjust Makefile for manpath.{c,h} linking.
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.379
retrieving revision 1.380
diff -LMakefile -LMakefile -u -p -r1.379 -r1.380
--- Makefile
+++ Makefile
@@ -23,7 +23,10 @@ VDATE = 8 October 2011
#
CFLAGS += -DUSE_WCHAR
-# If your system has manpath(1), check this off.
+# 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.
# CFLAGS += -DUSE_MANPATH
CFLAGS += -g -DHAVE_CONFIG_H -DVERSION="\"$(VERSION)\""
@@ -102,6 +105,8 @@ SRCS = Makefile \
mandocdb.c \
mandocdb.h \
mandoc_char.7 \
+ manpath.c \
+ manpath.h \
mdoc.h \
mdoc.7 \
mdoc.c \
@@ -272,25 +277,25 @@ $(MANDOC_HTML_OBJS) $(MANDOC_HTML_LNS):
$(MANDOC_TERM_OBJS) $(MANDOC_TERM_LNS): term.h
$(MANDOC_OBJS) $(MANDOC_LNS): main.h mandoc.h mdoc.h man.h config.h out.h
-MANDOCDB_OBJS = mandocdb.o
-MANDOCDB_LNS = mandocdb.ln
+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
+$(MANDOCDB_OBJS) $(MANDOCDB_LNS): 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
-APROPOS_LNS = apropos.ln apropos_db.ln
+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 mandocdb.h apropos_db.h
+$(APROPOS_OBJS) $(APROPOS_LNS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
-CGI_OBJS = cgi.o apropos_db.o
-CGI_LNS = cgi.ln apropos_db.ln
+CGI_OBJS = cgi.o apropos_db.o manpath.o
+CGI_LNS = cgi.ln apropos_db.ln manpath.ln
-$(CGI_OBJS) $(CGI_LNS): config.h mandoc.h mandocdb.h apropos_db.h
+$(CGI_OBJS) $(CGI_LNS): config.h mandoc.h apropos_db.h manpath.h mandocdb.h
DEMANDOC_OBJS = demandoc.o
DEMANDOC_LNS = demandoc.ln
@@ -454,7 +459,7 @@ llib-lapropos.ln: $(APROPOS_LNS) llib-ll
$(LINT) $(LINTFLAGS) -Capropos $(APROPOS_LNS) llib-llibmandoc.ln
man.cgi: $(CGI_OBJS) libmandoc.a
- $(CC) $(LDFLAGS) -o $@ $(CGI_OBJS) libmandoc.a $(DBLIB)
+ $(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
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2011-11-23 9:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201111230956.pAN9uHIc002714@krisdoz.my.domain \
--to=kristaps@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).