GNOME.org
 

[gtkhtml/gtk3-rebased: 1/11] Drop support for gtk+-2.0.

commit 3085aadae6e63372c5e0083e383f323c4166a878
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Dec 16 12:08:04 2010 -0500

    Drop support for gtk+-2.0.

 components/editor/Makefile.am |   15 ++-----------
 configure.ac                  |   43 +++++++---------------------------------
 gtkhtml/Makefile.am           |   22 +++++++++-----------
 3 files changed, 21 insertions(+), 59 deletions(-)
---
diff --git a/components/editor/Makefile.am b/components/editor/Makefile.am
index 900e417..b3e642d 100644
--- a/components/editor/Makefile.am
+++ b/components/editor/Makefile.am
@@ -3,6 +3,7 @@
 gtkhtml_data = $(datadir)/gtkhtml- GTKHTML_API_VERSION@
 
 bin_PROGRAMS = gtkhtml-editor-test
+lib_LTLIBRARIES = libgtkhtml-editor-4.0.la
 
 AM_CFLAGS = \
 	@GTKHTML_CFLAGS@			\
@@ -23,7 +24,7 @@ BUILT_SOURCES = \
 
 libgtkhtml_editordir = $(includedir)/libgtkhtml- GTKHTML_API_VERSION@/editor
 
-csources = 					\
+libgtkhtml_editor_4_0_la_SOURCES = \
 	$(BUILT_SOURCES)			\
 	gtkhtml-color-combo.c			\
 	gtkhtml-color-combo.h			\
@@ -63,21 +64,11 @@ libgtkhtml_editor_HEADERS = \
 	gtkhtml-spell-checker.h			\
 	gtkhtml-spell-language.h
 
-if ENABLE_GTK3
-lib_LTLIBRARIES = libgtkhtml-editor-4.0.la
-libgtkhtml_editor_4_0_la_SOURCES = $(csources) 
 libgtkhtml_editor_4_0_la_LIBADD = \
 	@GTKHTML_LIBS@				\
 	$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
+
 libgtkhtml_editor_4_0_la_LDFLAGS = -no-undefined
-else
-lib_LTLIBRARIES = libgtkhtml-editor-3.14.la
-libgtkhtml_editor_3_14_la_SOURCES = $(csources) 
-libgtkhtml_editor_3_14_la_LIBADD = \
-	@GTKHTML_LIBS@				\
-	$(top_builddir)/gtkhtml/libgtkhtml- GTKHTML_API_VERSION@.la
-libgtkhtml_editor_3_14_la_LDFLAGS = -no-undefined
-endif
 
 gtkhtml_editor_test_SOURCES = main.c
 
diff --git a/configure.ac b/configure.ac
index a6236c2..76a40dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,33 +9,13 @@ AC_CONFIG_SRCDIR(README)
 PACKAGE=gtkhtml
 
 dnl Required Package Versions
+m4_define([gtk_minimum_version], [2.90.4])
 m4_define([enchant_minimum_version], [1.1.7])
 m4_define([gnome_icon_theme_minimum_version], [2.22.0])
 m4_define([cairo_minimum_version], [1.10.0])
 
-dnl **********************************
-dnl GTK version
-dnl **********************************
-
-AC_ARG_ENABLE([gtk3],
-	AS_HELP_STRING([--enable-gtk3],
-	[Attempt to use gtk+-3]),
-	[enable_gtk3=$enableval],[enable_gtk3=no])
-
-if test "x${enable_gtk3}" = "xyes"; then
-	GTK_PACKAGE="gtk+-3.0"
-	GAIL_PACKAGE="gail-3.0"
-	gtk_minimum_version="2.90.4"
-	GTKHTML_API_VERSION=4.0
-	EDITOR_API_VERSION=4.0
-else	
-	GTK_PACKAGE="gtk+-2.0"
-	GAIL_PACKAGE="gail"
-	gtk_minimum_version="2.22.0"
-	GTKHTML_API_VERSION=3.15
-	EDITOR_API_VERSION=3.14
-fi
-AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes])
+GTKHTML_API_VERSION=4.0
+EDITOR_API_VERSION=4.0
 
 AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "${GTKHTML_API_VERSION}", [GtkHTML API Version])
 AC_SUBST(GTKHTML_API_VERSION)
@@ -166,7 +146,7 @@ AC_SUBST(LDFLAGS)
 dnl **********************************
 dnl GAIL modules
 dnl **********************************
-GAIL_MODULES="$GAIL_PACKAGE >= $gtk_minimum_version"
+GAIL_MODULES="gail-3.0 >= gtk_minimum_version"
 PKG_CHECK_MODULES(GAIL, $GAIL_MODULES)
 AC_SUBST(GAIL_CFLAGS)
 AC_SUBST(GAIL_LIBS)
@@ -175,7 +155,7 @@ AC_SUBST(GAIL_MODULES)
 dnl **********************************
 dnl GTKHTML modules
 dnl **********************************
-GTKHTML_MODULES="$GTK_PACKAGE >= $gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes cairo >= cairo_minimum_version"
+GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gconf-2.0 iso-codes cairo >= cairo_minimum_version"
 PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
 AC_SUBST(GTKHTML_CFLAGS)
 AC_SUBST(GTKHTML_LIBS)
@@ -298,26 +278,20 @@ dnl **********************************
 
 dnl Increment the following if the interface has additions, changes,
 dnl removals.
-GTKHTML_CURRENT=20
-GTKHTML_GTK3_CURRENT=0
+GTKHTML_CURRENT=0
 
 dnl Increment any time the source changes; set to 0 if you
 dnl increment CURRENT.
-GTKHTML_REVISION=1
-GTKHTML_GTK3_REVISION=0
+GTKHTML_REVISION=0
 
 dnl Increment if any interfaces have been added; set to 0
 dnl if any interfaces have been removed. removal has 
 dnl precedence over adding, so set to 0 if both happened.
-GTKHTML_AGE=1
-GTKHTML_GTK3_AGE=0
+GTKHTML_AGE=0
 
 AC_SUBST(GTKHTML_CURRENT)
 AC_SUBST(GTKHTML_REVISION)
 AC_SUBST(GTKHTML_AGE)
-AC_SUBST(GTKHTML_GTK3_CURRENT)
-AC_SUBST(GTKHTML_GTK3_REVISION)
-AC_SUBST(GTKHTML_GTK3_AGE)
 
 dnl **************
 dnl Done.
@@ -340,7 +314,6 @@ AC_OUTPUT
 echo "
 Configuration:
 
-	GTK+ package            :		${GTK_PACKAGE}
 	Cookies support in soup :		${HAVE_NEWSOUP}
 	Editor component type   :		${GNOME_GTKHTML_EDITOR_TYPE}
 "
diff --git a/gtkhtml/Makefile.am b/gtkhtml/Makefile.am
index 5541597..e9ff602 100644
--- a/gtkhtml/Makefile.am
+++ b/gtkhtml/Makefile.am
@@ -32,6 +32,8 @@ AM_CFLAGS = 						\
 
 libgtkhtmldir = $(includedir)/libgtkhtml- GTKHTML_API_VERSION@/gtkhtml
 
+lib_LTLIBRARIES = libgtkhtml-4.0.la
+
 # FIXME not all the stuff should be installed!
 
 libgtkhtml_HEADERS =				\
@@ -47,7 +49,7 @@ libgtkhtml_HEADERS =				\
 	htmltokenizer.h				\
 	$(NULL)
 
-csources =					\
+libgtkhtml_4_0_la_SOURCES =			\
 	gtkhtml-embedded.c			\
 	gtkhtml-properties.c			\
 	gtkhtml-search.c			\
@@ -202,17 +204,13 @@ csources =					\
 	$(PLATFORM_DEP_SOURCES)			\
 	$(NULL)
 
-if ENABLE_GTK3
-lib_LTLIBRARIES = libgtkhtml-4.0.la
-libgtkhtml_4_0_la_SOURCES = $(csources)
-libgtkhtml_4_0_la_LDFLAGS = -version-info $(GTKHTML_GTK3_CURRENT):$(GTKHTML_GTK3_REVISION):$(GTKHTML_GTK3_AGE) -no-undefined
-libgtkhtml_4_0_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la $(GAIL_LIBS) $(REGEX_LIBS)
-else
-lib_LTLIBRARIES = libgtkhtml-3.15.la
-libgtkhtml_3_15_la_SOURCES = $(csources)
-libgtkhtml_3_15_la_LDFLAGS = -version-info $(GTKHTML_CURRENT):$(GTKHTML_REVISION):$(GTKHTML_AGE) -no-undefined
-libgtkhtml_3_15_la_LIBADD = $(GTKHTML_LIBS) ../a11y/libgtkhtml-a11y.la $(GAIL_LIBS) $(REGEX_LIBS)
-endif
+libgtkhtml_4_0_la_LDFLAGS = -version-info $(GTKHTML_CURRENT):$(GTKHTML_REVISION):$(GTKHTML_AGE) -no-undefined
+
+libgtkhtml_4_0_la_LIBADD =			\
+	$(GTKHTML_LIBS)				\
+	../a11y/libgtkhtml-a11y.la		\
+	$(GAIL_LIBS)				\
+	$(REGEX_LIBS)
 
 dist-hook:
 	mkdir $(distdir)/tests
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]