diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
4 files changed, 15 insertions, 2 deletions
@@ -1,5 +1,12 @@ 2008-10-25 Jonathon Jongsma <jonathon@quotidian.org> + * configure.in: + * data/Makefile.am: + * tests/Makefile.am: fix some distcheck failures (pkg-config files and + unit-test-generated images were not removed on distclean) + +2008-10-25 Jonathon Jongsma <jonathon@quotidian.org> + * NEWS: explicitly mention that 1.7.0 is an unstable release 2008-10-22 Jonathon Jongsma <jonathon@quotidian.org> diff --git a/configure.in b/configure.in index 8ef229f..1ad001a 100644 --- a/configure.in +++ b/configure.in @@ -115,6 +115,9 @@ dnl base dependencies DEPS_PC="cairo >= 1.8.0 sigc++-2.0" +dnl always install the 'base' pkg-config file +INSTALLED_PC="cairomm-1.0.pc" + dnl then check and add additional dependencies PKG_CHECK_MODULES(CAIROFT, cairo-ft, [HAS_FT=yes], [HAS_FT=no]) if test x$HAS_FT = xyes; then @@ -192,7 +195,7 @@ PKG_CHECK_MODULES(CAIROMM, [$DEPS_PC]) AC_SUBST(INSTALLED_PC) -CONFIG_PC=data/cairomm-1.0.pc +CONFIG_PC="" for pc in $INSTALLED_PC; do CONFIG_PC="$CONFIG_PC data/$pc" done diff --git a/data/Makefile.am b/data/Makefile.am index 48f90de..cb3b574 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,4 +21,6 @@ EXTRA_DIST = $(ALL_PC_IN) # Install the pkg-config files: pkgconfigdir = $(libdir)/pkgconfig # $INSTALLED_PC is computed in configure.in -pkgconfig_DATA = cairomm-1.0.pc $(INSTALLED_PC) +pkgconfig_DATA = $(INSTALLED_PC) + +DISTCLEANFILES=$(INSTALLED_PC) diff --git a/tests/Makefile.am b/tests/Makefile.am index b088433..250d60c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,3 +26,4 @@ INCLUDES = -I$(top_srcdir) @CAIROMM_CFLAGS@ LIBS = $(top_builddir)/cairomm/libcairomm-1.0.la @LIBS@ @CAIROMM_LIBS@ @BOOST_UNIT_TEST_FRAMEWORK_STATIC_LIB@ EXTRA_DIST=png-stream-test.png +DISTCLEANFILES=test.ps test.pdf |