From 5d617751083d4e618f7d8db5e723f29ad10227cf Mon Sep 17 00:00:00 2001 From: marschap Date: Fri, 10 Oct 2008 10:08:10 +0000 Subject: [PATCH] add Makefile targets to compile & install clients & server separately --- ChangeLog | 1 + Makefile.am | 29 ++++++++++++++++++++++++++--- docs/Makefile.am | 10 ++++++++++ docs/lcdproc-dev/Makefile.am | 2 ++ docs/lcdproc-user/Makefile.am | 2 ++ 5 files changed, 41 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1dfc008..becb406 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ v.0.5dev (ongoing development) + picolcd driver: support to send IR commands to LIRC (Jack Cleaver) + picolcd driver: support for 20x4 picoLCDs (Nicu Pavel) + hd44780 driver: new ConnectionType uss720 (Eric Pooch) + * new make targets to compile & install server & clients separately v.0.5.2 * fix switching on/off the Load screen in lcdproc client using the menu diff --git a/Makefile.am b/Makefile.am index f628444..e1d7d1e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,30 @@ sysconf_DATA = LCDd.conf EXTRA_DIST = $(sysconf_DATA) CREDITS README.IRman contrib +dist-hook: + rm -rf `find $(distdir)/contrib -name CVS` + + ## convenience targets + +.PHONY: $(SUBDIRS) install-server install-clients + +$(SUBDIRS): + $(MAKE) -C $@ + +clients server: shared + +install-server: server + $(MAKE) -C server install + $(MAKE) -C docs install-server-man + +install-clients: clients + $(MAKE) -C clients install + $(MAKE) -C docs install-client-man + + +.PHONY: install-html-guides install-html-developerguide install-html-userguide + install-html-guides: install-html-developerguide install-html-userguide install-html-developerguide: @@ -19,6 +42,9 @@ install-html-developerguide: install-html-userguide: $(MAKE) -C docs $@ + +.PHONY: dox topleveltags + dox: $(MAKE) -C docs $@ @@ -26,7 +52,4 @@ topleveltags: $(CTAGS) --format=1 -f - --languages=C --c-kinds=f --recurse=yes server shared clients \ | perl -p -e 's/^([^\t]+)\t[^\t]+\/([^\t\/]+)\t(.*)$/$1\t$2\t$3/' > tags -dist-hook: - rm -rf `find $(distdir)/contrib -name CVS` - ## EOF diff --git a/docs/Makefile.am b/docs/Makefile.am index 0b0836f..24f167c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -31,6 +31,16 @@ CLEANFILES = LCDd.8 lcdproc.1 lcdproc-config.5 ## convenience targets + +.PHONY: install-server-man install-client-man + +install-server-man: install-man8 install-man5 + +install-client-man: install-man1 install-man5 + + +.PHONY: install-html-guides install-html-developerguide install-html-userguide + install-html-guides: install-html-developerguide install-html-userguide install-html-developerguide: diff --git a/docs/lcdproc-dev/Makefile.am b/docs/lcdproc-dev/Makefile.am index c16750c..06fec2d 100644 --- a/docs/lcdproc-dev/Makefile.am +++ b/docs/lcdproc-dev/Makefile.am @@ -16,6 +16,8 @@ EXTRA_DIST = lcdproc-dev.docbook \ xmlto = /usr/bin/xmlto developerguidedir = $(DESTDIR)$(htmldir)/developer-guide/ +.PHONY: install-html-developerguide + install-html-developerguide: $(xmlto) lcdproc-dev.docbook $(mkinstalldirs) $(developerguidedir) $(xmlto) html -o $(developerguidedir) lcdproc-dev.docbook diff --git a/docs/lcdproc-user/Makefile.am b/docs/lcdproc-user/Makefile.am index 22b124c..6756600 100644 --- a/docs/lcdproc-user/Makefile.am +++ b/docs/lcdproc-user/Makefile.am @@ -19,6 +19,8 @@ EXTRA_DIST = bookinfo.docbook \ xmlto = /usr/bin/xmlto userguidedir = $(DESTDIR)$(htmldir)/user-guide/ +.PHONY: install-html-userguide + install-html-userguide: $(xmlto) lcdproc-user.docbook $(mkinstalldirs) $(userguidedir) $(xmlto) html -o $(userguidedir) lcdproc-user.docbook