From: Maciej Piechotka Date: Mon, 15 Aug 2011 18:00:33 +0000 (+0100) Subject: Allow to install libgee 0.6 and 0.8 in parallel X-Git-Tag: 0.7.0~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6fc195b449f1462bd6eea962799b814ad2c519b;p=platform%2Fupstream%2Flibgee.git Allow to install libgee 0.6 and 0.8 in parallel --- diff --git a/.gitignore b/.gitignore index e274fdf..b81fc0b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,9 +26,9 @@ compile stamp-h1 *.pc lcov.info -doc/gee-1.0 -gee/gee-1.0.vapi -gee/gee-internals-1.0.vapi +doc/gee-0.8 +gee/gee-0.8.vapi +gee/gee-internals-0.8.vapi benchmark/benchmarks tests/tests tests/coverage diff --git a/Makefile.am b/Makefile.am index ccfb23a..87d8c82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ endif .PHONY: coverage pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gee-1.0.pc +pkgconfig_DATA = gee-0.8.pc dist-hook: gen-ChangeLog @@ -53,6 +53,6 @@ EXTRA_DIST += \ ChangeLog.pre-0-1-5 \ gitlog-to-changelog \ MAINTAINERS \ - gee-1.0.pc.in \ + gee-0.8.pc.in \ $(NULL) diff --git a/benchmark/Makefile.am b/benchmark/Makefile.am index 2a869a7..f43ebbb 100644 --- a/benchmark/Makefile.am +++ b/benchmark/Makefile.am @@ -11,7 +11,7 @@ benchmarks_SOURCES = \ benchmarks_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/gee \ - --pkg gee-internals-1.0 \ + --pkg gee-internals-0.8 \ $(NULL) benchmarks_CPPFLAGS = \ @@ -21,7 +21,7 @@ benchmarks_CPPFLAGS = \ benchmarks_LDADD = \ $(GLIB_LIBS) \ - ../gee/libgee.la \ + ../gee/libgee-0.8.la \ $(NULL) benchmarks_LDFLAGS = \ diff --git a/configure.ac b/configure.ac index f66c9f0..444a8f5 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AM_PROG_CC_C_O AC_DISABLE_STATIC AC_PROG_LIBTOOL -LIBGEE_LT_VERSION="3:0:0" +LIBGEE_LT_VERSION="0:0:0" AC_SUBST(LIBGEE_LT_VERSION) AM_PROG_VALAC([0.9.3]) @@ -59,7 +59,7 @@ AC_SUBST(GLIB_LIBS) GOBJECT_INTROSPECTION_CHECK([0.9.0]) AC_OUTPUT([Makefile - gee-1.0.pc + gee-0.8.pc benchmark/Makefile doc/Makefile gee/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 90d18b9..8a11807 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,33 +2,33 @@ include $(top_srcdir)/Makefile.decl SRC_DIR = $(top_srcdir)/gee -docdir=$(datadir)/devhelp/references/gee-1.0 -innerdocdir=$(datadir)/devhelp/references/gee-1.0/gee-1.0 -imgdir=$(datadir)/devhelp/references/gee-1.0/gee-1.0/img +docdir=$(datadir)/devhelp/references/gee-0.8 +innerdocdir=$(datadir)/devhelp/references/gee-0.8/gee-0.8 +imgdir=$(datadir)/devhelp/references/gee-0.8/gee-0.8/img doc_data = \ - gee-1.0/*.css \ - gee-1.0/*.png \ + gee-0.8/*.css \ + gee-0.8/*.png \ $(NULL) doc_DATA = \ - gee-1.0/index.html \ + gee-0.8/index.html \ $(doc_data) \ $(NULL) innerdoc_DATA = \ - gee-1.0/gee-1.0/index.htm \ - gee-1.0/gee-1.0/*.html \ + gee-0.8/gee-0.8/index.htm \ + gee-0.8/gee-0.8/*.html \ $(NULL) img_DATA = \ - gee-1.0/gee-1.0/img/*.png \ + gee-0.8/gee-0.8/img/*.png \ $(NULL) -$(doc_data) $(innerdoc_DATA) $(img_DATA): gee-1.0/index.html +$(doc_data) $(innerdoc_DATA) $(img_DATA): gee-0.8/index.html -gee-1.0/index.html: - $(VALADOC) -o gee-1.0/ --wiki ./ --force -b $(top_srcdir) $(SRC_DIR)/*.vala +gee-0.8/index.html: + $(VALADOC) -o gee-0.8/ --wiki ./ --force -b $(top_srcdir) $(SRC_DIR)/*.vala EXTRA_DIST += \ index.wiki \ diff --git a/gee-1.0.pc.in b/gee-0.8.pc.in similarity index 79% rename from gee-1.0.pc.in rename to gee-0.8.pc.in index a5840c8..f0c2a9e 100644 --- a/gee-1.0.pc.in +++ b/gee-0.8.pc.in @@ -9,5 +9,5 @@ Name: libgee Description: The GObject collection library Version: @VERSION@ Requires: glib-2.0 gobject-2.0 -Libs: -L${libdir} -lgee -Cflags: -I${includedir}/gee-1.0 +Libs: -L${libdir} -lgee-0.8 +Cflags: -I${includedir}/gee-0.8 diff --git a/gee/Makefile.am b/gee/Makefile.am index 98e14b8..e77539a 100644 --- a/gee/Makefile.am +++ b/gee/Makefile.am @@ -1,10 +1,10 @@ include $(top_srcdir)/Makefile.decl lib_LTLIBRARIES = \ - libgee.la + libgee-0.8.la $(NULL) -libgee_la_SOURCES = \ +libgee_0_8_la_SOURCES = \ abstractcollection.vala \ abstractlist.vala \ abstractmap.vala \ @@ -56,31 +56,31 @@ libgee_la_SOURCES = \ unfolditerator.vala \ $(NULL) -libgee_la_VALAFLAGS = \ - -H gee.h --vapi gee-1.0.vapi \ +libgee_0_8_la_VALAFLAGS = \ + -H gee.h --vapi gee-0.8.vapi \ -h gee-internals.h \ - --internal-vapi gee-internals-1.0.vapi \ - --library gee-1.0 --gir Gee-1.0.gir \ + --internal-vapi gee-internals-0.8.vapi \ + --library gee-0.8 --gir Gee-0.8.gir \ $(COVERAGE_VALAFLAGS) \ $(VALAFLAGS) \ $(NULL) -libgee_la_CPPFLAGS = \ +libgee_0_8_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) -libgee_la_LIBADD = \ +libgee_0_8_la_LIBADD = \ $(GLIB_LIBS) \ $(COVERAGE_LIBS) \ $(NULL) -libgee_la_LDFLAGS = \ +libgee_0_8_la_LDFLAGS = \ -version-info $(LIBGEE_LT_VERSION) \ -no-undefined \ $(NULL) -geeincludedir = $(includedir)/gee-1.0 +geeincludedir = $(includedir)/gee-0.8 geeinclude_HEADERS = \ gee.h \ @@ -89,31 +89,31 @@ geeinclude_HEADERS = \ vapidir = $(datadir)/vala/vapi dist_vapi_DATA = \ - gee-1.0.vapi \ + gee-0.8.vapi \ $(NULL) if HAVE_INTROSPECTION girdir = @INTROSPECTION_GIRDIR@ gir_DATA = \ - Gee-1.0.gir \ + Gee-0.8.gir \ $(NULL) typelibdir = @INTROSPECTION_TYPELIBDIR@ typelib_DATA = \ - Gee-1.0.typelib \ + Gee-0.8.typelib \ $(NULL) -Gee-1.0.typelib: Gee-1.0.gir - @INTROSPECTION_COMPILER@ --shared-library=libgee -o $@ $^ +Gee-0.8.typelib: Gee-0.8.gir + @INTROSPECTION_COMPILER@ --shared-library=libgee-0.8 -o $@ $^ endif -Gee-1.0.gir gee-internals-1.0.vapi gee-1.0.vapi: libgee.la +Gee-0.8.gir gee-internals-0.8.vapi gee-0.8.vapi: libgee-0.8.la CLEANFILES = \ - gee-1.0.vapi \ - gee-internals-1.0.vapi \ - Gee-1.0.typelib \ - Gee-1.0.gir \ + gee-0.8.vapi \ + gee-internals-0.8.vapi \ + Gee-0.8.typelib \ + Gee-0.8.gir \ $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5142745..9318544 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -37,13 +37,13 @@ tests_SOURCES = \ $(NULL) tests_DEPENDENCIES = \ - $(top_srcdir)/gee/gee-1.0.vapi \ + $(top_srcdir)/gee/gee-0.8.vapi \ $(NULL) tests_VALAFLAGS = \ --basedir $(top_srcdir) \ --vapidir $(top_srcdir)/gee \ - --pkg gee-1.0 --pkg posix \ + --pkg gee-0.8 --pkg posix \ $(NULL) tests_CPPFLAGS = \ @@ -52,7 +52,7 @@ tests_CPPFLAGS = \ $(NULL) tests_LDADD = \ - $(GLIB_LIBS) ../gee/libgee.la \ + $(GLIB_LIBS) ../gee/libgee-0.8.la \ $(NULL) coverage-reset: