diff options
| author | Jiří Techet <techet@gmail.com> | 2014-09-17 23:24:24 +0200 |
|---|---|---|
| committer | Jiří Techet <techet@gmail.com> | 2014-09-17 23:24:24 +0200 |
| commit | ce7cbe375f81d31421fa4872ec966fe9f53f12ec (patch) | |
| tree | 2de675b16b1de3fad1b30fefcdb0b18e7f8db31c /demos | |
| parent | 1bf18c23e64863812397e67a9741d8880889a530 (diff) | |
| download | libchamplain-ce7cbe375f81d31421fa4872ec966fe9f53f12ec.tar.gz | |
Fix some compilation warnings in automake
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/Makefile.am | 13 |
1 files changed, 5 insertions, 8 deletions
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 = \ |