GNOME.org
 

[ease] Increment version.

commit a6f5cdee56f84acbe2578d489ca25591e4571241
Author: Nate Stedman <natesm gmail com>
Date:   Thu Aug 19 22:08:28 2010 -0400

    Increment version.
    
    Easier to do in the future, mostly automatic now.

 Makefile.am                   |    4 ++--
 configure.ac                  |   21 ++++++++++++++++++---
 ease-core/Makefile.am         |   29 ++++++++++++++++-------------
 ease/Makefile.am              |    8 ++++----
 flutter/Makefile.am           |   24 ++++++++++++------------
 pkgconfig/ease-core-0.3.pc.in |   11 -----------
 pkgconfig/ease-core-0.4.pc.in |   11 +++++++++++
 pkgconfig/flutter-0.3.pc.in   |    6 +++---
 vapi/ease-core-0.3.deps       |    5 -----
 vapi/ease-core-0.4.deps       |    9 +++++++++
 10 files changed, 75 insertions(+), 53 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 86376a0..344904d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = \
-    pkgconfig/ease-core-0.3.pc \
-    pkgconfig/flutter-0.3.pc
+    pkgconfig/ease-core- EASE_CORE_VERSION@.pc \
+    pkgconfig/flutter- FLUTTER_VERSION@.pc
     
 run: ease/ease
 	ease/ease
diff --git a/configure.ac b/configure.ac
index c751144..c365005 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,15 @@
-AC_INIT([Ease], [0.3], [https://bugzilla.gnome.org/enter_bug.cgi?product=ease], [ease], [http://live.gnome.org/Ease])
-
 AC_PREREQ([2.59])
 
+m4_define(ease_version, 0.4)
+m4_define(ease_core_version, 0.4)
+m4_define(flutter_version, 0.3)
+
+AC_INIT([Ease],
+        [ease_version],
+        [https://bugzilla.gnome.org/enter_bug.cgi?product=ease],
+        [ease],
+        [http://live.gnome.org/Ease])
+
 AC_CONFIG_FILES([
 	Makefile
 	po/Makefile.in
@@ -9,7 +17,7 @@ AC_CONFIG_FILES([
 	ease-core/Makefile
 	flutter/Makefile
 	ease/Makefile
-	pkgconfig/ease-core-0.3.pc
+	pkgconfig/ease-core-0.4.pc
 	pkgconfig/flutter-0.3.pc])
 
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -70,6 +78,13 @@ AC_SUBST(EASE_CFLAGS)
 AC_SUBST(EASE_LIBS)
 AC_SUBST(EASE_PACKAGES)
 
+AC_DEFINE(EASE_VERSION, ease_version, [Ease Version])
+AC_SUBST(EASE_VERSION, ease_version)
+AC_DEFINE(EASE_CORE_VERSION, ease_core_version, [Ease Core Version])
+AC_SUBST(EASE_CORE_VERSION, ease_core_version)
+AC_DEFINE(FLUTTER_VERSION, flutter_version, [Flutter Version])
+AC_SUBST(FLUTTER_VERSION, flutter_version)
+
 dnl internationalization
 GETTEXT_PACKAGE=ease
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
diff --git a/ease-core/Makefile.am b/ease-core/Makefile.am
index 3f3eaa4..0767edd 100644
--- a/ease-core/Makefile.am
+++ b/ease-core/Makefile.am
@@ -1,7 +1,7 @@
-lib_LTLIBRARIES = libease-core-0.3.la
+lib_LTLIBRARIES = libease-core- EASE_CORE_VERSION@.la
 
 # source files
-libease_core_0_3_la_SOURCES = \
+libease_core_ EASE_CORE_VERSION@_la_SOURCES = \
 	ease-actor.vala \
 	ease-animated-zoom-slider.vala \
 	ease-archiver.vala \
@@ -53,27 +53,28 @@ libease_core_0_3_la_SOURCES = \
 #      function warnings
 # Therefore, warnings are off.
 
-libease_core_0_3_la_VALAFLAGS = \
+libease_core_ EASE_CORE_VERSION@_la_VALAFLAGS = \
 	$(EASE_PACKAGES) \
-	--vapi=$(top_srcdir)/vapi/ease-core-0.3.vapi \
+	--vapi=$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.vapi \
 	--header=ease-core.h \
 	--thread \
 	--disable-warnings \
 	--vapidir=$(top_srcdir)/vapi \
-	--pkg flutter-0.3 \
+	--pkg flutter- FLUTTER_VERSION@ \
 	-g \
 	$(NULL)
 
-libease_core_0_3_la_LIBADD = $(top_builddir)/flutter/libflutter-0.3.la
+libease_core_ EASE_CORE_VERSION@_la_LIBADD = \
+	$(top_builddir)/flutter/libflutter- FLUTTER_VERSION@.la
 
-libease_core_0_3_la_CFLAGS = \
+libease_core_ EASE_CORE_VERSION@_la_CFLAGS = \
 	$(EASE_CFLAGS) \
 	-w \
 	-include $(top_srcdir)/config.h \
 	-I$(top_srcdir)/flutter \
 	$(NULL)
 	
-libease_core_0_3_la_LDFLAGS = \
+libease_core_ EASE_CORE_VERSION@_la_LDFLAGS = \
 	$(EASE_LDFLAGS) \
 	--export-dynamic \
 	$(NULL)
@@ -84,15 +85,17 @@ libease_include_HEADERS = ease-core.h
 
 # vapi installation
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = $(top_srcdir)/vapi/ease-core-0.3.vapi $(top_srcdir)/vapi/ease-core-0.3.deps
+vapi_DATA = \
+	$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.vapi \
+	$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.deps
 
 # remove generated files on `make clean`
 CLEANFILES = \
-	$(subst .vala,.c,$(libease_core_0_3_la_SOURCES)) \
-	$(top_srcdir)/vapi/ease-core-0.3.vapi \
+	$(subst .vala,.c,$(libease_core_ EASE_CORE_VERSION@_la_SOURCES)) \
+	$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.vapi \
 	ease-core.h
 
 EXTRA_DIST = \
-	$(top_srcdir)/vapi/ease-core-0.3.vapi \
-	$(top_srcdir)/vapi/ease-core-0.3.deps
+	$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.vapi \
+	$(top_srcdir)/vapi/ease-core- EASE_CORE_VERSION@.deps
 
diff --git a/ease/Makefile.am b/ease/Makefile.am
index fd40395..2833425 100644
--- a/ease/Makefile.am
+++ b/ease/Makefile.am
@@ -25,8 +25,8 @@ ease_SOURCES = \
 
 # compiler flags
 ease_VALAFLAGS = \
-	--pkg ease-core-0.3 \
-	--pkg flutter-0.3 \
+	--pkg ease-core- EASE_CORE_VERSION@ \
+	--pkg flutter- FLUTTER_VERSION@ \
 	--disable-warnings \
 	$(EASE_PACKAGES) \
 	--vapidir $(top_srcdir)/vapi \
@@ -43,8 +43,8 @@ ease_CFLAGS = \
 ease_LDFLAGS = $(EASE_LIBS) --export-dynamic
 
 ease_LDADD = \
-	$(top_builddir)/ease-core/libease-core-0.3.la \
-	$(top_builddir)/flutter/libflutter-0.3.la \
+	$(top_builddir)/ease-core/libease-core- EASE_CORE_VERSION@.la \
+	$(top_builddir)/flutter/libflutter- FLUTTER_VERSION@.la \
 	-lm \
 	$(NULL)
 
diff --git a/flutter/Makefile.am b/flutter/Makefile.am
index 52748db..5f7c216 100644
--- a/flutter/Makefile.am
+++ b/flutter/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libflutter-0.3.la
+lib_LTLIBRARIES = libflutter- FLUTTER_VERSION@.la
 
 INCLUDES = \
 	$(EASE_CFLAGS)
@@ -11,19 +11,19 @@ AM_CPPFLAGS = \
 	$(NULL)
 
 # source files
-libflutter_0_3_la_SOURCES = flutter.vala
+libflutter_ FLUTTER_VERSION@_la_SOURCES = flutter.vala
 
 # compiler flags
-libflutter_0_3_la_VALAFLAGS = \
+libflutter_ FLUTTER_VERSION@_la_VALAFLAGS = \
 	--pkg clutter-1.0 \
-	--vapi=$(top_srcdir)/vapi/flutter-0.3.vapi \
+	--vapi=$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.vapi \
 	--header=flutter.h \
 	--thread \
 	-g \
 	$(NULL)
 
-libflutter_0_3_la_CFLAGS = $(EASE_CFLAGS)
-libflutter_0_3_la_LDFLAGS = $(EASE_LDFLAGS)
+libflutter_ FLUTTER_VERSION@_la_CFLAGS = $(EASE_CFLAGS)
+libflutter_ FLUTTER_VERSION@_la_LDFLAGS = $(EASE_LDFLAGS)
 
 # header installation
 flutter_includedir=$(includedir)/flutter/
@@ -32,17 +32,17 @@ flutter_include_HEADERS = flutter.h
 # vapi installation
 vapidir = $(datadir)/vala/vapi
 vapi_DATA = \
-	$(top_srcdir)/vapi/flutter-0.3.vapi \
-	$(top_srcdir)/vapi/flutter-0.3.deps
+	$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.vapi \
+	$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.deps
 
 # remove generated files on `make clean`
 CLEANFILES = \
 	flutter.c \
-	$(top_srcdir)/vapi/flutter-0.3.vapi \
+	$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.vapi \
 	flutter.h \
-	libflutter_0_3_la-flutter.lo
+	libflutter_ FLUTTER_VERSION@_la-flutter.lo
 
 EXTRA_DIST = \
-	$(top_srcdir)/vapi/flutter-0.3.vapi \
-	$(top_srcdir)/vapi/flutter-0.3.deps
+	$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.vapi \
+	$(top_srcdir)/vapi/flutter- FLUTTER_VERSION@.deps
 
diff --git a/pkgconfig/ease-core-0.4.pc.in b/pkgconfig/ease-core-0.4.pc.in
new file mode 100644
index 0000000..3d80a4a
--- /dev/null
+++ b/pkgconfig/ease-core-0.4.pc.in
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: libease-core
+Description: Ease backend library
+Requires: clutter-gtk-0.10 gee-1.0 json-glib-1.0 libarchive gmodule-2.0 flutter- FLUTTER_VERSION@ clutter-gst-1.0 unique-1.0 poppler-glib
+Version: @EASE_CORE_VERSION@
+Libs: -L${libdir} -lease-core- EASE_CORE_VERSION@
+Cflags: -I${includedir}/ease-core- EASE_CORE_VERSION@ -I${libdir}/ease-core- EASE_CORE_VERSION@/include
diff --git a/pkgconfig/flutter-0.3.pc.in b/pkgconfig/flutter-0.3.pc.in
index 507b56d..990c74f 100644
--- a/pkgconfig/flutter-0.3.pc.in
+++ b/pkgconfig/flutter-0.3.pc.in
@@ -3,9 +3,9 @@ exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
 
-Name: libflutter
+Name: Flutter
 Description: Foreach-enabled Clutter for Vala
 Requires: clutter-1.0
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lflutter-0.3
-Cflags: -I${includedir}/flutter-0.3 -I${libdir}/flutter-0.3/include
+Libs: -L${libdir} -lflutter- FLUTTER_VERSION@
+Cflags: -I${includedir}/flutter- FLUTTER_VERSION@ -I${libdir}/flutter- FLUTTER_VERSION@/include
diff --git a/vapi/ease-core-0.4.deps b/vapi/ease-core-0.4.deps
new file mode 100644
index 0000000..f181131
--- /dev/null
+++ b/vapi/ease-core-0.4.deps
@@ -0,0 +1,9 @@
+flutter-0.3
+clutter-gtk-0.10
+gee-1.0
+json-glib-1.0
+libarchive
+unique-1.0
+clutter-gst-1.0
+poppler-glib
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]