Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
Makefile.am | 7 +------
docs/Makefile.am | 19 +++++++------------
2 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f2107d9..fdf3275 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,11 +39,6 @@ dist_doc_DATA = COPYING INSTALL README TODO
SUBDIRS = include lib docs pkgconfig tests
-install-exec-local:
- $(INSTALL) -d $(DESTDIR)/${SOCKETDIR}
-
-uninstall-local:
- rmdir $(DESTDIR)/${SOCKETDIR} || :;
lint:
$(MAKE) -C lib lint
@@ -58,7 +53,7 @@ maintainer-clean-local:
rm -rf m4
clean-generic:
- rm -rf docs/html docs/man3 $(SPEC) $(TARFILE)
+ rm -rf $(SPEC) $(TARFILE)
## make rpm/srpm section.
diff --git a/docs/Makefile.am b/docs/Makefile.am
index b4e497c..234932a 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -20,23 +20,18 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = man.dox html.dox
-dist_man_MANS = man3/qbtsafe.h.3 man3/qbhdb.h.3 man3/qblist.h.3 \
- man3/qbpoll.h.3 man3/qbtimer.h.3 man3/qbplugin.h.3 \
- man3/qbplugin_comp.h.3 man3/qbipcc.h.3 man3/qbipcs.h.3 \
- man3/qbqueue.h.3 man3/qbwthread.h.3 man3/qblogsys.h.3 \
- man3/qbhash.h.3 man3/qbipc_common.h.3 man3/qbutil.h.3
-
inc_dir = $(top_srcdir)/include/qb
-
-dependant_headers = $(inc_dir)/qbtsafe.h $(inc_dir)/qbhdb.h $(inc_dir)/qblist.h \
- $(inc_dir)/qbpoll.h $(inc_dir)/qbtimer.h $(inc_dir)/qbplugin.h \
- $(inc_dir)/qbplugin_comp.h $(inc_dir)/qbipcc.h $(inc_dir)/qbipc_common.h \
- $(inc_dir)/qbipcs.h $(inc_dir)/qbqueue.h $(inc_dir)/qbwthread.h \
- $(inc_dir)/qblogsys.h $(inc_dir)/qbhash.h $(inc_dir)/qbutil.h
+dependant_headers = $(wildcard $(inc_dir)/qb*.h)
+dist_man_MANS = $(addsuffix .3,$(subst $(inc_dir),man3,$(dependant_headers)))
$(dist_man_MANS): man.dox $(dependant_headers)
+ mkdir -p man3
doxygen man.dox
doxygen: html.dox
+ mkdir -p html
doxygen html.dox
+clean-generic:
+ rm -rf html man3
+
--
1.6.6.1