GNOME.org
 

[goocanvas] Use GTK+ 3 instead of GTK+ 2.

commit d3d9b6038ef003883091d4a91cfa59c0e2639e3b
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Jun 11 22:37:05 2010 +0200

    Use GTK+ 3 instead of GTK+ 2.
    
    * goocanvas.pc.in: Rename to goocanvas-2.0.pc.in:
    * configure.in
    * Makefile.am
    * demo/Makefile.am:  Depend on GTK+ 3 instead of GTK+ 2.
    Change the library name from libgoocanvas to libgoocanvas-2.0.
    Install the headers in <prefix>/include/goocanvas-2.0 instead of
    <prefix>/include/goocanvas-1.0.

 ChangeLog                              |   15 +++++++++++++++
 Makefile.am                            |    4 ++--
 configure.in                           |    4 ++--
 demo/Makefile.am                       |   26 ++++++++++++++------------
 goocanvas.pc.in => goocanvas-2.0.pc.in |    6 +++---
 src/Makefile.am                        |   10 +++++-----
 6 files changed, 41 insertions(+), 24 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 168b0ee..1c5ea31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-06-11  Murray Cumming  <murrayc murrayc com>
+
+	Use GTK+ 3 instead of GTK+ 2.
+
+	* goocanvas.pc.in: Rename to goocanvas-2.0.pc.in:
+	* configure.in
+	* Makefile.am
+	* demo/Makefile.am:  Depend on GTK+ 3 instead of GTK+ 2.
+	Change the library name from libgoocanvas to libgoocanvas-2.0.
+	Install the headers in <prefix>/include/goocanvas-2.0 instead of 
+	<prefix>/include/goocanvas-1.0.
+
+This is the master branch for goocanvas-2.0, using GTK+ 3
+See also the goocanvas-1.0 branch.
+
 2010-05-10  Damon Chaplin  <damon gnome org>
 
 	* src/goocanvastext.c: improve docs for "width" and "height" properties.
diff --git a/Makefile.am b/Makefile.am
index 2b0ee98..ebf1ef7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,6 +6,6 @@ SUBDIRS = src demo docs po
 AUTOMAKE_OPTIONS = 1.7
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = goocanvas.pc
+pkgconfig_DATA = goocanvas-2.0.pc
 
-EXTRA_DIST = goocanvas.pc.in autogen.sh
+EXTRA_DIST = goocanvas-2.0.pc.in autogen.sh
diff --git a/configure.in b/configure.in
index 83d498d..00f2334 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ AC_PROG_CC
 AC_HEADER_STDC
 AM_PROG_LIBTOOL
 
-pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.10.0 cairo >= 1.4.0"
+pkg_modules="gtk+-3.0 >= 2.90.0 glib-2.0 >= 2.10.0 cairo >= 1.4.0"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_CFLAGS)
 AC_SUBST(PACKAGE_LIBS)
@@ -81,6 +81,6 @@ src/Makefile
 demo/Makefile
 docs/Makefile
 po/Makefile.in
-goocanvas.pc
+goocanvas-2.0.pc
 ])
 
diff --git a/demo/Makefile.am b/demo/Makefile.am
index 74f72fb..07e0ddb 100644
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -4,6 +4,8 @@ INCLUDES = \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
 	@PACKAGE_CFLAGS@
+	
+DEMO_LIBS = $(top_builddir)/src/libgoocanvas-2.0.la @PACKAGE_LIBS@ $(INTLLIBS)
 
 #	-DG_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED \
 #	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
@@ -18,7 +20,7 @@ demo_SOURCES = \
 	demo-clipping.c demo-table.c demo-large-line.h demo-large-line.c \
 	demo-large-items.c demo-large-rect.h demo-large-rect.c
 
-demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+demo_LDADD = $(DEMO_LIBS)
 
 mv_demo_SOURCES = \
 	mv-demo.c mv-demo-fifteen.c mv-demo-scalability.c mv-demo-grabs.c \
@@ -26,57 +28,57 @@ mv_demo_SOURCES = \
 	mv-demo-paths.c mv-demo-focus.c mv-demo-animation.c \
 	mv-demo-clipping.c mv-demo-table.c
 
-mv_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+mv_demo_LDADD = $(DEMO_LIBS)
 
 table_demo_SOURCES = \
 	table-demo.c
 
-table_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+table_demo_LDADD = $(DEMO_LIBS)
 
 mv_table_demo_SOURCES = \
 	mv-table-demo.c
 
-mv_table_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+mv_table_demo_LDADD = $(DEMO_LIBS)
 
 simple_demo_SOURCES = \
 	simple-demo.c
 
-simple_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+simple_demo_LDADD = $(DEMO_LIBS)
 
 mv_simple_demo_SOURCES = \
 	mv-simple-demo.c
 
-mv_simple_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+mv_simple_demo_LDADD = $(DEMO_LIBS)
 
 scalability_demo_SOURCES = \
 	scalability-demo.c
 
-scalability_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+scalability_demo_LDADD = $(top_builddir)/src/libgoocanva-2.0s.la @PACKAGE_LIBS@ $(INTLLIBS)
 
 mv_scalability_demo_SOURCES = \
 	mv-scalability-demo.c
 
-mv_scalability_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+mv_scalability_demo_LDADD = $(DEMO_LIBS)
 
 units_demo_SOURCES = \
 	units-demo.c
 
-units_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+units_demo_LDADD = $(DEMO_LIBS)
 
 widgets_demo_SOURCES = \
 	widgets-demo.c
 
-widgets_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+widgets_demo_LDADD = $(DEMO_LIBS)
 
 generic_position_demo_SOURCES = \
 	generic-position-demo.c
 
-generic_position_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+generic_position_demo_LDADD = $(DEMO_LIBS)
 
 mv_generic_position_demo_SOURCES = \
 	mv-generic-position-demo.c
 
-mv_generic_position_demo_LDADD = $(top_builddir)/src/libgoocanvas.la @PACKAGE_LIBS@ $(INTLLIBS)
+mv_generic_position_demo_LDADD = $(DEMO_LIBS)
 
 EXTRA_DIST = flower.png toroid.png
 
diff --git a/goocanvas.pc.in b/goocanvas-2.0.pc.in
similarity index 63%
rename from goocanvas.pc.in
rename to goocanvas-2.0.pc.in
index eb5239e..6dcaeff 100644
--- a/goocanvas.pc.in
+++ b/goocanvas-2.0.pc.in
@@ -7,7 +7,7 @@ includedir= includedir@
 Name: GooCanvas
 Description: A GTK+ canvas widget using cairo
 Version: @VERSION@
-Requires: gtk+-2.0 cairo
-Libs: -L${libdir} -lgoocanvas
-Cflags: -I${includedir}/goocanvas-1.0
+Requires: gtk+-3.0 cairo
+Libs: -L${libdir} -lgoocanvas-2.0
+Cflags: -I${includedir}/goocanvas-2.0
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b49c009..4abd1e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,9 +10,9 @@ INCLUDES = \
 #	-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
 #	-DGTK_DISABLE_DEPRECATED
 
-lib_LTLIBRARIES = libgoocanvas.la
+lib_LTLIBRARIES = libgoocanvas-2.0.la
 
-libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
+libgoocanvas_2_0_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
@@ -23,9 +23,9 @@ libtool_opts =				\
   -export-dynamic $(no_undefined)	\
   -rpath $(libdir)
 
-libgoocanvas_la_LDFLAGS = $(libtool_opts) 
+libgoocanvas_2_0_la_LDFLAGS = $(libtool_opts) 
 
-libgoocanvasincludedir = $(includedir)/goocanvas-1.0
+libgoocanvasincludedir = $(includedir)/goocanvas-2.0
 
 libgoocanvas_public_headers =		\
 	goocanvasellipse.h		\
@@ -45,7 +45,7 @@ libgoocanvas_public_headers =		\
 	goocanvaswidget.h		\
 	goocanvas.h
 
-libgoocanvas_la_SOURCES =		\
+libgoocanvas_2_0_la_SOURCES =		\
 	goocanvasatk.h			\
 	goocanvasatk.c			\
 	goocanvasellipse.c		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]