gobject-introspection r110 - in trunk: . girepository

[johan svn gnome org]

Author: johan
Date: Sun Feb 10 19:19:15 2008
New Revision: 110
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=110&view=rev

Log:
2008-02-10  Johan Dahlin  <johan gnome org>

	* Makefile.am:
	* configure.ac:
	* girepository/Makefile.am:
	Make 'make distcheck' work again.



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/girepository/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Feb 10 19:19:15 2008
@@ -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-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 -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 @@
 check-coverage: coverage-report.txt
 	@cat $(top_builddir)/coverage-report.txt
 
+.PHONEY: gcov-all coverage-report.txt
+
 else
 
 check-coverage:

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Feb 10 19:19:15 2008
@@ -5,7 +5,6 @@
 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])

Modified: trunk/girepository/Makefile.am
==============================================================================
--- trunk/girepository/Makefile.am	(original)
+++ trunk/girepository/Makefile.am	Sun Feb 10 19:19:15 2008
@@ -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 @@
 girepo_HEADERS = girepository.h
 
 GCOV_SOURCES = $(libgirepository_la_SOURCES)
-include $(top_srcdir)/gcov.mak