From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Properly partition the build system and install some missing
Date: Mon, 4 Aug 2014 23:15:22 -0400 (EDT) [thread overview]
Message-ID: <201408050315.s753FMdT015867@krisdoz.my.domain> (raw)
Log Message:
-----------
Properly partition the build system and install some missing stuff:
* Introduce targets base-build and db-build.
* Introduce targets base-install and db-install.
* Introduce a BUILD_TARGETS variable to contain db-build.
* Introduce an INSTALL_TARGETS variable and fill it using BUILD_TARGETS.
* Install the apropos(1) and mandocdb(8) binaries.
* Install whatis(1) as a hard link to apropos(1).
* Install the apropos(1), whatis(1), and mandocdb(8) manuals.
* Install mandoc_aux.h.
Tags:
----
VERSION_1_12
Modified Files:
--------------
mdocml:
Makefile
Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/Makefile,v
retrieving revision 1.395.2.22
retrieving revision 1.395.2.23
diff -LMakefile -LMakefile -u -p -r1.395.2.22 -r1.395.2.23
--- Makefile
+++ Makefile
@@ -54,8 +54,13 @@ INSTALL_MAN = $(INSTALL_DATA)
# If you want to build without database support, for example to avoid
# the dependency on Berkeley DB, comment the following line.
+# However, you won't get apropos(1) and makewhatis(8) in that case.
#
-DBBIN = apropos mandocdb whatis
+BUILD_TARGETS += db-build
+
+# The remaining settings in this section
+# are only relevant if db-build is enabled.
+# Otherwise, they have no effect either way.
# Non-BSD systems (Linux, etc.) need -ldb to compile mandocdb and
# apropos.
@@ -73,9 +78,10 @@ HTDOCDIR = $(WWWPREFIX)/htdocs
# === END OF USER SETTINGS =============================================
-ALLBIN = mandoc preconv demandoc $(DBBIN)
+INSTALL_TARGETS = $(BUILD_TARGETS:-build=-install)
-all: $(ALLBIN)
+BASEBIN = mandoc preconv demandoc
+DBBIN = apropos mandocdb
TESTSRCS = test-betoh64.c \
test-fgetln.c \
@@ -234,6 +240,14 @@ COMPAT_OBJS = compat_fgetln.o \
# === DEPENDENCY HANDLING ==============================================
+all: base-build $(BUILD_TARGETS)
+
+base-build: $(BASEBIN)
+
+db-build: $(DBBIN)
+
+install: base-install $(INSTALL_TARGETS)
+
arch.o: arch.in
att.o: att.in
chars.o: chars.in
@@ -319,7 +333,7 @@ www: $(WWW_OBJS) $(WWW_MANS)
clean:
rm -f libmandoc.a $(LIBMANDOC_OBJS)
- rm -f apropos whatis $(APROPOS_OBJS)
+ rm -f apropos $(APROPOS_OBJS)
rm -f mandocdb $(MANDOCDB_OBJS)
rm -f preconv $(PRECONV_OBJS)
rm -f demandoc $(DEMANDOC_OBJS)
@@ -328,7 +342,7 @@ clean:
rm -f $(WWW_MANS) $(WWW_OBJS)
rm -rf *.dSYM
-install: all
+base-install: base-build
mkdir -p $(DESTDIR)$(BINDIR)
mkdir -p $(DESTDIR)$(EXAMPLEDIR)
mkdir -p $(DESTDIR)$(LIBDIR)
@@ -336,16 +350,26 @@ install: all
mkdir -p $(DESTDIR)$(MANDIR)/man1
mkdir -p $(DESTDIR)$(MANDIR)/man3
mkdir -p $(DESTDIR)$(MANDIR)/man7
- $(INSTALL_PROGRAM) mandoc preconv demandoc $(DESTDIR)$(BINDIR)
+ $(INSTALL_PROGRAM) $(BASEBIN) $(DESTDIR)$(BINDIR)
$(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
- $(INSTALL_LIB) man.h mdoc.h mandoc.h $(DESTDIR)$(INCLUDEDIR)
+ $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
+ $(DESTDIR)$(INCLUDEDIR)
$(INSTALL_MAN) mandoc.1 preconv.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
$(INSTALL_MAN) mandoc.3 tbl.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)
-installwww: www
+db-install: db-build
+ mkdir -p $(DESTDIR)$(BINDIR)
+ mkdir -p $(DESTDIR)$(MANDIR)/man1
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+ $(INSTALL_PROGRAM) $(DBBIN) $(DESTDIR)$(BINDIR)
+ ln -f $(DESTDIR)$(BINDIR)/apropos $(DESTDIR)$(BINDIR)/whatis
+ $(INSTALL_MAN) apropos.1 whatis.1 $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL_MAN) mandocdb.8 $(DESTDIR)$(MANDIR)/man8
+
+www-install: www
mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
$(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
$(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
@@ -366,9 +390,6 @@ mandocdb: $(MANDOCDB_OBJS) libmandoc.a
preconv: $(PRECONV_OBJS)
$(CC) $(LDFLAGS) -o $@ $(PRECONV_OBJS)
-whatis: apropos
- cp -f apropos whatis
-
apropos: $(APROPOS_OBJS) libmandoc.a
$(CC) $(LDFLAGS) -o $@ $(APROPOS_OBJS) libmandoc.a $(DBLIB)
@@ -389,7 +410,7 @@ config.h: configure config.h.pre config.
rm -f config.log
CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure
-.PHONY: clean install installwww
+.PHONY: base-install clean db-install install www-install
.SUFFIXES: .1 .3 .5 .7 .8 .h
.SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
next reply other threads:[~2014-08-05 3:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-05 3:15 schwarze [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-08-05 3:02 schwarze
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=201408050315.s753FMdT015867@krisdoz.my.domain \
--to=schwarze@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).