From: Pierre-Luc Beaudoin Date: Fri, 17 Oct 2008 01:41:18 +0000 (-0400) Subject: Make distcheck fix X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec39e2ab86006686e123e36435ef7e199632cd69;p=libchamplain Make distcheck fix --- diff --git a/Makefile.am b/Makefile.am index c6da01e..9e22869 100644 --- 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 9b75425..f673527 100644 --- 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 e7dc398..fb48351 100644 --- 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 f0e6255..fdc06b2 100644 --- 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.