Make distcheck fix

diff --git a/Makefile.am b/Makefile.am
index c6da01eeaca21272d723fe67c0669d1255c0b9b8..9e22869b8dfa08eb0df3d9e878ac6747a2909084 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,4 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
+CLEANFILES = $(pcfiles)

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 9b754250d74acdef1ac1e1e878a16e91a2a986ed..f673527312f21c45c0bcfa829db4d4c69087db6f 100644 (file)
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -25,7 +25,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK_MARSHAL_LIST)
        @GLIB_GENMARSHAL@ --body --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).c
 
 libchamplain_includedir=$(includedir)/libchamplain-gtk-1.0/champlain-gtk
-libchamplain_include_HEADERS = champlainviewembed.h
+libchamplain_include_HEADERS = champlain-gtk.h champlainviewembed.h
 
 libchamplain_gtk_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 

diff --git a/demos/Makefile.am b/demos/Makefile.am
index e7dc398a2ee40c96e40837b4b110ab815c29b814..fb48351d66e78e40fb9b1f8f7a423d9a40e8d9b5 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -1,6 +1,9 @@
 noinst_PROGRAMS = launcher
 
+INCLUDES = -I$(top_srcdir)
+
 AM_CPPFLAGS = $(DEPS_CFLAGS) 
 AM_LDFLAGS = $(DEPS_LIBS) 
+
 launcher_SOURCES = launcher.c
 launcher_LDADD = $(DEPS_LIBS) ../champlain-gtk/libchamplain-gtk-0.2.la

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f0e62558c4ac56fbde9b23ba776751e319d67330..fdc06b2e83924fcf4350d5e0e580b3d477aab5f9 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -61,7 +61,7 @@ expand_content_files=
 # signals and properties.
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=-I$(top_builddir)/champlain -I$(top_builddir) $(DEPS_CFLAGS)
+INCLUDES=-I$(top_srcdir)/champlain -I$(top_srcdir) -I$(top_builddir) $(DEPS_CFLAGS)
 GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain-gtk/libchamplain-gtk-1.0.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.