aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-08-02 11:53:41 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-08-02 11:53:41 +0000
commit40c48ae68e99fdf537d40c22d578c0f20ec2a4a6 (patch)
tree9107744c5d196abe8080e486503c77da4c07553b
parentf399c6109b979d3a9d0898e385b02b8906770bf9 (diff)
downloadpaludis-40c48ae68e99fdf537d40c22d578c0f20ec2a4a6.tar.gz
paludis-40c48ae68e99fdf537d40c22d578c0f20ec2a4a6.tar.xz
Make 'make dist' work even when 'make' hasn't previously been run
-rw-r--r--Makefile.am16
-rw-r--r--src/qualudis/Makefile.am10
-rw-r--r--src/qualudis/qualudis_command_line.hh2
3 files changed, 20 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 201a396..768855c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,22 @@
-CLEANFILES = *~ done-check gmon.out *.gcov *.gcno *.gcda
+CLEANFILES = *~ done-check gmon.out *.gcov *.gcno *.gcda automake-deps-hack.tmp
MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
config.h config.h.in INSTALL COPYING
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip std-options
-EXTRA_DIST = autogen.bash
+EXTRA_DIST = autogen.bash automake-deps-hack.tmp
SUBDIRS = misc test paludis ebuild src doc hooks eselect
+DISTCHECK_CONFIGURE_FLAGS = --enable-qa
+
+automake-deps-hack.tmp :
+ make -C paludis/util
+ make -C paludis/args
+ make -C src/paludis paludis.1
+ make -C src/qualudis qualudis.1
+ touch $@
+
+dist-hook :
+ rm $(distdir)/automake-deps-hack.tmp
+
doxygen :
$(MAKE) -C doc doxygen
diff --git a/src/qualudis/Makefile.am b/src/qualudis/Makefile.am
index 8d52380..f2cdae5 100644
--- a/src/qualudis/Makefile.am
+++ b/src/qualudis/Makefile.am
@@ -5,11 +5,13 @@ DEFS= \
-DBIGTEMPDIR=\"/var/tmp\"
SUBDIRS = .
+man_pages = qualudis.1
+
if ENABLE_QA
bin_PROGRAMS = qualudis
noinst_PROGRAMS = man-qualudis
-man_MANS = qualudis.1
+man_MANS = $(man_pages)
qualudis_SOURCES = \
qualudis_command_line.hh qualudis_command_line.cc \
@@ -43,14 +45,12 @@ man_qualudis_SOURCES = \
qualudis_command_line.cc
man_qualudis_LDADD = \
- $(top_builddir)/paludis/qa/libpaludisqa.la \
- $(top_builddir)/paludis/libpaludis.la \
$(top_builddir)/paludis/args/libpaludisargs.la \
$(top_builddir)/paludis/util/libpaludisutil.la \
$(DYNAMIC_LD_LIBS)
CLEANFILES = *~ version_TEST gmon.out *.gcov *.gcno *.gcda
-DISTCLEANFILES = $(man_MANS)
+DISTCLEANFILES = $(man_pages)
MAINTAINERCLEANFILES = Makefile.in
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = $(man_pages)
diff --git a/src/qualudis/qualudis_command_line.hh b/src/qualudis/qualudis_command_line.hh
index d2ef29e..ed2c1af 100644
--- a/src/qualudis/qualudis_command_line.hh
+++ b/src/qualudis/qualudis_command_line.hh
@@ -4,7 +4,7 @@
#define PALUDIS_GUARD_SRC_QUALUDIS_QUALUDIS_COMMAND_LINE_HH 1
#include <paludis/args/args.hh>
-#include <paludis/qa/qa.hh>
+#include <paludis/qa/message.hh>
#include <paludis/util/instantiation_policy.hh>
class QualudisCommandLine :