From 3172c9fafc8e71d28dfeefd1e8feca4fff30de62 Mon Sep 17 00:00:00 2001 From: Pierre-Luc Beaudoin Date: Sun, 13 Sep 2009 10:18:00 -0400 Subject: [PATCH] Make demos, binginds and doc use 0.4 too --- bindings/python/champlain-gtk/Makefile.am | 4 ++-- bindings/python/champlain/Makefile.am | 2 +- demos/Makefile.am | 14 +++++++------- docs/reference-gtk/Makefile.am | 2 +- docs/reference/Makefile.am | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bindings/python/champlain-gtk/Makefile.am b/bindings/python/champlain-gtk/Makefile.am index 17e0afc..88102dd 100644 --- 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 16cae0d..691bae1 100644 --- 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 b30974e..4abb6ea 100644 --- 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 8b6038c..d8d7e31 100644 --- 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 887e688..144a1c4 100644 --- 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 -- 2.39.5