Make demos, binginds and doc use 0.4 too

diff --git a/bindings/python/champlain-gtk/Makefile.am b/bindings/python/champlain-gtk/Makefile.am
index 17e0afcac475014a4cdbe58f76de60b9c7bf8a57..88102ddac11ca29aabad672a27c03773d7dab0f6 100644 (file)
--- a/bindings/python/champlain-gtk/Makefile.am
+++ b/bindings/python/champlain-gtk/Makefile.am
@@ -23,8 +23,8 @@ champlaingtk_la_SOURCES =                     \
 
 champlaingtk_la_LIBADD =                                       \
        $(PYTHON_BINDING_LIBS)                          \
-       $(top_builddir)/champlain/libchamplain-0.3.la   \
-       $(top_builddir)/champlain-gtk/libchamplain-gtk-0.3.la
+       $(top_builddir)/champlain/libchamplain-0.4.la   \
+       $(top_builddir)/champlain-gtk/libchamplain-gtk-0.4.la
 
 champlaingtk_la_LDFLAGS =                                      \
        -module -avoid-version

diff --git a/bindings/python/champlain/Makefile.am b/bindings/python/champlain/Makefile.am
index 16cae0d3b6afb0575a064ce67f9baef4b3dbb2fb..691bae1bbc21604c2ae1af12804214632005d862 100644 (file)
--- a/bindings/python/champlain/Makefile.am
+++ b/bindings/python/champlain/Makefile.am
@@ -22,7 +22,7 @@ champlain_la_SOURCES =                                        \
 
 champlain_la_LIBADD =                                  \
        $(PYTHON_BINDING_LIBS)                          \
-       $(top_builddir)/champlain/libchamplain-0.3.la
+       $(top_builddir)/champlain/libchamplain-0.4.la
 
 champlain_la_LDFLAGS =                                 \
        -module -avoid-version

diff --git a/demos/Makefile.am b/demos/Makefile.am
index b30974e4627750cca23e3c10a7ffc08a5b2158bc..4abb6ea0a366435fc76afae85ec5f9bdb965eb26 100644 (file)
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -6,26 +6,26 @@ AM_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
 AM_LDFLAGS = $(DEPS_LIBS)
 
 launcher_SOURCES = launcher.c markers.c
-launcher_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.3.la
+launcher_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 
 animated_marker_SOURCES = animated-marker.c
-animated_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.3.la
+animated_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 
 polygons_SOURCES = polygons.c
-polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.3.la
+polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 
 url_marker_SOURCES = url-marker.c
-url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.3.la
+url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS)
-url_marker_LDADD = $(SOUP_DEPS_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-0.3.la
+url_marker_LDADD = $(SOUP_DEPS_LIBS) $(DEPS_LIBS) ../champlain/libchamplain-0.4.la
 
 if ENABLE_GTK
 noinst_PROGRAMS += launcher-gtk
 launcher_gtk_SOURCES = launcher-gtk.c markers.c
 launcher_gtk_CPPFLAGS = $(GTK_DEPS_CFLAGS)
 launcher_gtk_LDADD = $(GTK_DEPS_LIBS) $(DEPS_LIBS) \
-               ../champlain-gtk/libchamplain-gtk-0.3.la \
-               ../champlain/libchamplain-0.3.la
+               ../champlain-gtk/libchamplain-gtk-0.4.la \
+               ../champlain/libchamplain-0.4.la
 endif
 
 EXTRA_DIST= markers.h

diff --git a/docs/reference-gtk/Makefile.am b/docs/reference-gtk/Makefile.am
index 8b6038c6489bbd7a25c7cd325545e8a5bba7d13c..d8d7e31a5d56aa58137cf0a3b43457520c440409 100644 (file)
--- a/docs/reference-gtk/Makefile.am
+++ b/docs/reference-gtk/Makefile.am
@@ -65,7 +65,7 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir)/champlain -I$(top_srcdir) -I$(top_builddir) $(DEPS_CFLAGS)
-GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-0.3.la $(top_builddir)/champlain-gtk/libchamplain-gtk-0.3.la
+GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-0.4.la $(top_builddir)/champlain-gtk/libchamplain-gtk-0.4.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 887e6885dd08ace376d063a0ff1d52c4da6765c9..144a1c4d1c668e5d40810026056a172ec542c953 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -65,7 +65,7 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 INCLUDES=-I$(top_srcdir)/champlain -I$(top_srcdir) -I$(top_builddir) $(DEPS_CFLAGS)
-GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-0.3.la
+GTKDOC_LIBS=$(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-0.4.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make