From: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date: Thu, 16 Oct 2008 14:41:47 +0000 (-0400)
Subject: Use libchamplain-0.2.so instead of -1.0.so
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af1399d62cecc747261c3dd6fa3acccb84cd31e1;p=libchamplain

Use libchamplain-0.2.so instead of -1.0.so
This change will allow different versions of libchamplain to be installed in parallel.
---

diff --git a/Makefile.am b/Makefile.am
index 8956a6b..5a98276 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = tidy champlain demos docs/reference
 
-pcfiles = champlain-1.0.pc
+pcfiles = champlain-0.2.pc
 
-champlain-1.0.pc: champlain.pc
+champlain-0.2.pc: champlain.pc
 	@cp -f $< $@
 
 pkgconfig_DATA = $(pcfiles)
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index e515bab..663ab7a 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -8,9 +8,9 @@ CLEANFILES = $(BUILT_SOURCES)
 CHAMPLAIN_MARSHAL = champlain-marshal
 CHAMPLAIN_MARSHAL_LIST = champlain-marshal.list 
 
-lib_LTLIBRARIES = libchamplain-1.0.la
+lib_LTLIBRARIES = libchamplain-0.2.la
 
-libchamplain_1_0_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \
+libchamplain_0_2_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \
 					$(BUILT_SOURCES) \
 					champlainview.c \
 					champlainlayer.c \
@@ -40,7 +40,7 @@ noinst_HEADERS = champlainview.h \
 					sources/google_terrain.h \
 					sources/debugmap.h
 
-libchamplain_1_0_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
+libchamplain_0_2_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
 
 champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
 	@GLIB_GENMARSHAL@ --header --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).h 
@@ -48,10 +48,10 @@ champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
 champlain-marshal.c: $(CHAMPLAIN_MARSHAL_LIST)
 	@GLIB_GENMARSHAL@ --body --prefix=cpl_marshal $< > $(CHAMPLAIN_MARSHAL).c
 
-libchamplain_includedir=$(includedir)/libchamplain-1.0/champlain
+libchamplain_includedir=$(includedir)/libchamplain-0.2/champlain
 libchamplain_include_HEADERS = champlain.h champlainview.h champlain_defines.h champlainlayer.h champlainmarker.h
 
-libchamplain_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
+libchamplain_0_2_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 
 AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/tidy -I$(top_srcdir)
 AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*