From: Pierre-Luc Beaudoin Date: Thu, 16 Oct 2008 14:57:17 +0000 (-0400) Subject: Use libchamplain-gtk-0.2 instead of -1.0 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fa5fe3dab7bb38370c3616334f410966170a0c9;p=libchamplain Use libchamplain-gtk-0.2 instead of -1.0 --- diff --git a/Makefile.am b/Makefile.am index 5d2dac3..c6da01e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ SUBDIRS = champlain-gtk demos docs/reference -pcfiles = champlain-gtk-1.0.pc +pcfiles = champlain-gtk-0.2.pc -champlain-gtk-1.0.pc: champlain-gtk.pc +champlain-gtk-0.2.pc: champlain-gtk.pc @cp -f $< $@ pkgconfig_DATA = $(pcfiles) diff --git a/champlain-gtk.pc.in b/champlain-gtk.pc.in index a1d1c49..99a0e95 100644 --- a/champlain-gtk.pc.in +++ b/champlain-gtk.pc.in @@ -8,4 +8,4 @@ Description: Gtk+ Widget wrapper for libchamplain Version: @VERSION@ Libs: -L${libdir} -lchamplain-gtk-1.0 Cflags: -I${includedir}/libchamplain-gtk-1.0 -Requires: champlain-1.0 gobject-2.0 clutter-0.8 clutter-gtk-0.8 gtk+-2.0 +Requires: champlain-0.2 gobject-2.0 clutter-0.8 clutter-gtk-0.8 gtk+-2.0 diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am index 370a539..5082e12 100644 --- a/champlain-gtk/Makefile.am +++ b/champlain-gtk/Makefile.am @@ -8,15 +8,15 @@ CLEANFILES = $(BUILT_SOURCES) CHAMPLAIN_GTK_MARSHAL = champlain-gtk-marshal CHAMPLAIN_GTK_MARSHAL_LIST = champlain-gtk-marshal.list -lib_LTLIBRARIES = libchamplain-gtk-1.0.la +lib_LTLIBRARIES = libchamplain-gtk-0.2.la -libchamplain_gtk_1_0_la_SOURCES = $(CHAMPLAIN_GTK_MARSHAL_LIST) \ +libchamplain_gtk_0_2_la_SOURCES = $(CHAMPLAIN_GTK_MARSHAL_LIST) \ $(BUILT_SOURCES) \ champlainviewembed.c noinst_HEADERS = champlainviewembed.h -libchamplain_gtk_1_0_la_LIBADD = $(DEPS_LIBS) +libchamplain_gtk_0_2_la_LIBADD = $(DEPS_LIBS) champlain-gtk-marshal.h: $(CHAMPLAIN_GTK_MARSHAL_LIST) @GLIB_GENMARSHAL@ --header --prefix=champlain_gtk_marshal $< > $(CHAMPLAIN_GTK_MARSHAL).h @@ -27,7 +27,7 @@ champlain-gtk-marshal.c: $(CHAMPLAIN_GTK_MARSHAL_LIST) libchamplain_includedir=$(includedir)/libchamplain-gtk-1.0/champlain-gtk libchamplain_include_HEADERS = champlainviewembed.h -libchamplain_gtk_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION) +libchamplain_gtk_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION) AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(top_srcdir) AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*