diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | girepository/Makefile.am | 3 |
4 files changed, 15 insertions, 7 deletions
@@ -1,5 +1,12 @@ 2008-02-10 Johan Dahlin <johan@gnome.org> + * Makefile.am: + * configure.ac: + * girepository/Makefile.am: + Make 'make distcheck' work again. + +2008-02-10 Johan Dahlin <johan@gnome.org> + * m4/Makefile.am (EXTRA_DIST): its called as-compiler-flag.m4, not as-compiler.m4. diff --git a/Makefile.am b/Makefile.am index 978d2c09..189f1d72 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,9 @@ ## Process this file with automake to produce Makefile.in -DIST_SUBDIRS = m4 -SUBDIRS = gidl girepository tools tests ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = gidl girepository tools tests +DIST_SUBDIRS = m4 $(SUBDIRS) + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gobject-introspection.pc EXTRA_DIST = $(pkgconfig_DATA) @@ -16,7 +17,6 @@ clean-gcov: clean-gcno: find -name "*.gcno" -delete -.PHONEY: gcov-all gcov-all: @for dir in $(GCOV_DIRS); do \ cd $(abs_srcdir)/$$dir && \ @@ -24,8 +24,7 @@ gcov-all: gcov -f -p -o `find $(abs_builddir)/$$dir -newer $$file -name "*-$${file/.c/.gcda}" -print0 | sed -e 's/\.gcda/\.o/'` $$file > /dev/null; \ done \ done - -.PHONEY: coverage-report.txt + coverage-report.txt: clean clean-gcov all check gcov-all @rm -f $(top_builddir)/coverage-report.txt @echo -e "=== Coverage Report ===\n" >> $(top_builddir)/coverage-report.txt @@ -37,6 +36,8 @@ coverage-report.txt: clean clean-gcov all check gcov-all check-coverage: coverage-report.txt @cat $(top_builddir)/coverage-report.txt +.PHONEY: gcov-all coverage-report.txt + else check-coverage: diff --git a/configure.ac b/configure.ac index 906b2399..90b50f00 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,6 @@ AC_PREREQ(2.59) AC_INIT(gobject-introspection, 0.1, http://bugzilla.gnome.org/enter_bug.cgi?product=glib) AM_INIT_AUTOMAKE([1.7]) AM_MAINTAINER_MODE -AC_CONFIG_SRCDIR([girepository/ginvoke.c]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/girepository/Makefile.am b/girepository/Makefile.am index c79606ef..b15f033b 100644 --- a/girepository/Makefile.am +++ b/girepository/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to produce Makefile.in +include $(top_srcdir)/gcov.mak + INCLUDES = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" lib_LTLIBRARIES = libgirepository.la @@ -16,4 +18,3 @@ girepodir = $(includedir)/glib-2.0/gobject-introspection girepo_HEADERS = girepository.h GCOV_SOURCES = $(libgirepository_la_SOURCES) -include $(top_srcdir)/gcov.mak |