Fix some compilation warnings in automake

5 files changed, 44 insertions, 47 deletions

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 6a5777b..391d1d6 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -9,7 +9,7 @@ libchamplain_gtk_headers_public =	\
 	$(srcdir)/champlain-gtk.h
 
 libchamplain_gtk_sources = \
-	$(srcdir)/gtk-champlain-embed.c
+	gtk-champlain-embed.c
 
 
 # glib-genmarshal rules
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index 2d947d4..c04498d 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -54,44 +54,44 @@ libchamplain_headers_private =	\
 
 if ENABLE_MEMPHIS
 memphis_sources =		\
-	$(srcdir)/champlain-memphis-renderer.c
+	champlain-memphis-renderer.c
 endif
 
 libchamplain_sources =					\
 	$(memphis_sources)				\
-	$(srcdir)/champlain-debug.c 			\
-	$(srcdir)/champlain-view.c 			\
-	$(srcdir)/champlain-layer.c 			\
-	$(srcdir)/champlain-marker-layer.c		\
-	$(srcdir)/champlain-path-layer.c		\
-	$(srcdir)/champlain-location.c		\
-	$(srcdir)/champlain-coordinate.c		\
-	$(srcdir)/champlain-marker.c	 		\
-	$(srcdir)/champlain-label.c 			\
-	$(srcdir)/champlain-scale.c			\
-	$(srcdir)/champlain-license.c			\
-	$(srcdir)/champlain-tile.c			\
-	$(srcdir)/champlain-map-source.c		\
-	$(srcdir)/champlain-map-source-chain.c		\
-	$(srcdir)/champlain-tile-source.c		\
-	$(srcdir)/champlain-tile-cache.c		\
-	$(srcdir)/champlain-memory-cache.c		\
-	$(srcdir)/champlain-network-tile-source.c	\
-	$(srcdir)/champlain-file-cache.c		\
-	$(srcdir)/champlain-map-source-factory.c	\
-	$(srcdir)/champlain-map-source-desc.c		\
-	$(srcdir)/champlain-point.c			\
-	$(srcdir)/champlain-custom-marker.c		\
-	$(srcdir)/champlain-renderer.c			\
-	$(srcdir)/champlain-image-renderer.c		\
-	$(srcdir)/champlain-error-tile-renderer.c	\
-	$(srcdir)/champlain-file-tile-source.c		\
-	$(srcdir)/champlain-null-tile-source.c		\
-	$(srcdir)/champlain-network-bbox-tile-source.c	\
-	$(srcdir)/champlain-adjustment.c \
-	$(srcdir)/champlain-kinetic-scroll-view.c \
-	$(srcdir)/champlain-viewport.c	\
-	$(srcdir)/champlain-bounding-box.c
+	champlain-debug.c 			\
+	champlain-view.c 			\
+	champlain-layer.c 			\
+	champlain-marker-layer.c		\
+	champlain-path-layer.c		\
+	champlain-location.c		\
+	champlain-coordinate.c		\
+	champlain-marker.c	 		\
+	champlain-label.c 			\
+	champlain-scale.c			\
+	champlain-license.c			\
+	champlain-tile.c			\
+	champlain-map-source.c		\
+	champlain-map-source-chain.c		\
+	champlain-tile-source.c		\
+	champlain-tile-cache.c		\
+	champlain-memory-cache.c		\
+	champlain-network-tile-source.c	\
+	champlain-file-cache.c		\
+	champlain-map-source-factory.c	\
+	champlain-map-source-desc.c		\
+	champlain-point.c			\
+	champlain-custom-marker.c		\
+	champlain-renderer.c			\
+	champlain-image-renderer.c		\
+	champlain-error-tile-renderer.c	\
+	champlain-file-tile-source.c		\
+	champlain-null-tile-source.c		\
+	champlain-network-bbox-tile-source.c	\
+	champlain-adjustment.c \
+	champlain-kinetic-scroll-view.c \
+	champlain-viewport.c	\
+	champlain-bounding-box.c
 
 champlain-features.h: $(top_builddir)/config.status
 	$(AM_V_GEN) ( cd $(top_builddir) && ./config.status champlain/$@ )
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 8de1278..811fa61 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -2,9 +2,7 @@ noinst_PROGRAMS = minimal launcher animated-marker polygons url-marker create-de
 
 SUBDIRS = icons
 
-INCLUDES = -I$(top_srcdir)
-
-AM_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
+AM_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)
 
 minimal_SOURCES = minimal.c
 minimal_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
@@ -19,7 +17,6 @@ polygons_SOURCES = polygons.c
 polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 
 url_marker_SOURCES = url-marker.c
-url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
 url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 
 create_destroy_test_SOURCES = create-destroy-test.c
@@ -28,14 +25,14 @@ create_destroy_test_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-@CHAMPLAIN_AP
 if ENABLE_GTK
 noinst_PROGRAMS += minimal-gtk
 minimal_gtk_SOURCES = minimal-gtk.c
-minimal_gtk_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS)
+minimal_gtk_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)
 minimal_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \
 		../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \
 		../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 
 noinst_PROGRAMS += launcher-gtk
 launcher_gtk_SOURCES = launcher-gtk.c markers.c
-launcher_gtk_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS)
+launcher_gtk_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)
 launcher_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \
 		../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \
 		../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
@@ -43,7 +40,7 @@ launcher_gtk_LDADD = $(GTK_LIBS) $(DEPS_LIBS) \
 if ENABLE_MEMPHIS
 noinst_PROGRAMS += local-rendering
 local_rendering_SOURCES = local-rendering.c
-local_rendering_CPPFLAGS = $(GTK_CFLAGS) $(MEMPHIS_CFLAGS) $(WARN_CFLAGS)
+local_rendering_CPPFLAGS = $(GTK_CFLAGS) $(MEMPHIS_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)
 local_rendering_LDADD = $(GTK_LIBS) $(MEMPHIS_LIBS) $(DEPS_LIBS) \
 		../champlain-gtk/libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la \
 		../champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
@@ -53,7 +50,7 @@ endif
 if ENABLE_VALA_DEMOS
 noinst_PROGRAMS += launcher-vala
 launcher_vala_SOURCES = launcher-vala.vala markers-vala.vala
-VALAFLAGS = \
+AM_VALAFLAGS = \
   --vapidir=../champlain \
   --pkg atk --pkg clutter-1.0 --pkg champlain-@CHAMPLAIN_API_VERSION@
 launcher_vala_LDADD = \
diff --git a/docs/reference-gtk/Makefile.am b/docs/reference-gtk/Makefile.am
index a59d527..f1ad57e 100644
--- a/docs/reference-gtk/Makefile.am
+++ b/docs/reference-gtk/Makefile.am
@@ -20,11 +20,11 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 DOC_SOURCE_DIR=../../champlain-gtk
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func='g_type_init()'
+SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--rebuild-types
+SCAN_OPTIONS=--rebuild-types --deprecated-guards="GTK_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index a64b6ec..d0f019e 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -20,7 +20,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 DOC_SOURCE_DIR=../../champlain
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
@@ -89,7 +89,7 @@ expand_content_files=
 # signals and properties.
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=$(DEPS_CFLAGS) -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/champlain
+GTKDOC_CFLAGS=$(DEPS_CFLAGS) -I$(top_srcdir) -I$(top_builddir)
 GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.