GNOME.org
 

[libegg] Remove any mention of GTK+ 2

commit 664710b9d9c08c5a4444f7e6e4d83333871ae659
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Apr 12 12:20:45 2011 +0200

    Remove any mention of GTK+ 2

 configure.ac                         |   29 +++++---------------------
 libegg/Makefile.am                   |   37 +++++++--------------------------
 libegg/column-chooser/Makefile.am    |    6 ++--
 libegg/fileformatchooser/Makefile.am |    6 ++--
 libegg/smclient/Makefile.am          |    3 ++
 libegg/spreadtable/Makefile.am       |    8 +++---
 libegg/thumbnailpreview/Makefile.am  |    4 +-
 libegg/toolbareditor/Makefile.am     |    6 ++--
 libegg/treeviewutils/Makefile.am     |   10 ++++----
 libegg/wrapbox/Makefile.am           |    6 ++--
 10 files changed, 40 insertions(+), 75 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 78b7952..f2520c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,47 +65,30 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(memmove strerror timegm)
 
 ## here we get the flags we'll actually use
-PKG_CHECK_MODULES(EGG, gtk+-2.0 >= 2.5.0)
+PKG_CHECK_MODULES(EGG, gtk+-3.0 >= 3.0.0)
 AC_SUBST(EGG_LIBS)
 AC_SUBST(EGG_CFLAGS)
 
-PKG_CHECK_MODULES(EGG_DOCK, libglade-2.0)
-AC_SUBST(EGG_DOCK_LIBS)
-AC_SUBST(EGG_DOCK_CFLAGS)
-
 PKG_CHECK_MODULES(EGG_XML, libxml-2.0)
 AC_SUBST(EGG_XML_LIBS)
 AC_SUBST(EGG_XML_CFLAGS)
 
+## TODO: Use GDBus from glib instead?
 PKG_CHECK_EXISTS(dbus-glib-1, have_dbus=yes, have_dbus=no)
 AS_IF([test "x$have_dbus" = "xyes"], [DBUS_DEPS="dbus-glib-1"])
 AM_CONDITIONAL(HAVE_DBUS, test "$have_dbus" = "yes")
 
-PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-2.0 libgnomeui-2.0 $DBUS_DEPS)
+PKG_CHECK_MODULES(EGG_SMCLIENT, gtk+-3.0 $DBUS_DEPS)
 AC_SUBST(EGG_SMCLIENT_LIBS)
 AC_SUBST(EGG_SMCLIENT_CFLAGS)
 
-## check if we have gtk+ 2.5.x
-AM_CONDITIONAL(HAVE_GTK25, $PKG_CONFIG --atleast-version=2.5.0 gtk+-2.0)
-
-## check if we have gtk+ 2.7.x
-AM_CONDITIONAL(HAVE_GTK27, $PKG_CONFIG --atleast-version=2.7.0 gtk+-2.0)
-
-## check if we have gtk+ 2.10.x
-AM_CONDITIONAL(HAVE_GTK210, $PKG_CONFIG --atleast-version=2.10.0 gtk+-2.0)
-
-## check if we have gtk+ 3
-AM_CONDITIONAL(HAVE_GTK30, $PKG_CONFIG --atleast-version=2.91.1 gtk+-3.0)
-
-AM_COND_IF(HAVE_GTK30, [PKG_CHECK_MODULES(EGG_30, gtk+-3.0)])
-
 ## check if we have the X11 gtk+ backend
-AM_CONDITIONAL(HAVE_GTK_TARGET_X11, test `$PKG_CONFIG --variable=target gtk+-2.0` = x11)
+AM_CONDITIONAL(HAVE_GTK_TARGET_X11, test `$PKG_CONFIG --variable=target gtk+-3.0` = x11)
 
-GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
+GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`  
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 AC_SUBST(GLIB_MKENUMS)
 
 # Honor aclocal flags
diff --git a/libegg/Makefile.am b/libegg/Makefile.am
index 774efed..cc09e9b 100644
--- a/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -1,26 +1,3 @@
-if HAVE_GTK30
-spreadtable_SUBDIRS = \
-  spreadtable
-wrapbox_SUBDIRS = \
-  wrapbox
-endif
-
-if HAVE_GTK25
-thumbnail_SUBDIRS = \
-  pixbufthumbnail \
-  thumbnailpreview
-endif
-
-if HAVE_GTK27
-iconchooser_SUBDIRS = \
-  iconchooser
-endif
-
-if HAVE_GTK210
-gtk210_SUBDIRS = \
-  fileformatchooser
-endif
-
 if HAVE_GTK_TARGET_X11
 background_monitor_SUBDIRS = \
   background-monitor
@@ -28,14 +5,16 @@ endif
 
 SUBDIRS = util column-chooser treeviewutils \
   $(background_monitor_SUBDIRS) \
-  datetime $(thumbnail_SUBDIRS) \
-  smclient $(spreadtable_SUBDIRS) \
-  $(wrapbox_SUBDIRS) \
-  $(gtk210_SUBDIRS) \
-  $(gtk215_SUBDIRS)
+  datetime \
+  fileformatchooser \
+  pixbufthumbnail \
+  spreadtable \
+  thumbnailpreview \
+  smclient \
+  wrapbox
 
 # Don't compile broken code
-#$(iconchooser_SUBDIRS)
+# SUBDIRS += iconchooser
 
 AM_CPPFLAGS = \
   $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
diff --git a/libegg/column-chooser/Makefile.am b/libegg/column-chooser/Makefile.am
index 9625dcc..add9ef3 100644
--- a/libegg/column-chooser/Makefile.am
+++ b/libegg/column-chooser/Makefile.am
@@ -1,10 +1,10 @@
 AM_CPPFLAGS = \
-  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION
 
 noinst_LTLIBRARIES = libegg-columnchooser.la
 
-libegg_columnchooser_la_LIBADD = $(EGG_30_LIBS)
+libegg_columnchooser_la_LIBADD = $(EGG_LIBS)
 libegg_columnchooser_la_SOURCES = \
 	eggcolumnchooserdialog.c	\
 	eggcolumnmodel.c
@@ -17,5 +17,5 @@ noinst_HEADERS = \
 noinst_PROGRAMS = test-tree-column
 
 test_tree_column_SOURCES = test-tree-column.c
-test_tree_column_LDADD = libegg-columnchooser.la $(EGG_30_LIBS)
+test_tree_column_LDADD = libegg-columnchooser.la $(EGG_LIBS)
 test_tree_column_DEPENDENCIES = libegg-columnchooser.la
diff --git a/libegg/fileformatchooser/Makefile.am b/libegg/fileformatchooser/Makefile.am
index a547f6d..2a64963 100644
--- a/libegg/fileformatchooser/Makefile.am
+++ b/libegg/fileformatchooser/Makefile.am
@@ -1,12 +1,12 @@
 AM_CPPFLAGS = \
-  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -I$(top_srcdir)/libegg/util \
   -DEGG_COMPILATION
 
 
 noinst_LTLIBRARIES = libeggfileformatchooser.la
 
-libeggfileformatchooser_la_LIBADD = $(EGG_30_LIBS)
+libeggfileformatchooser_la_LIBADD = $(EGG_LIBS)
 
 libeggfileformatchooser_la_SOURCES = \
   eggfileformatchooser.c
@@ -17,6 +17,6 @@ noinst_HEADERS = \
 noinst_PROGRAMS = testfileformatchooser
 
 testfileformatchooser_SOURCES = testfileformatchooser.c
-testfileformatchooser_LDFLAGS = libeggfileformatchooser.la $(EGG_30_LIBS)
+testfileformatchooser_LDFLAGS = libeggfileformatchooser.la $(EGG_LIBS)
 testfileformatchooser_DEPENDENCIES = libeggfileformatchooser.la 
 
diff --git a/libegg/smclient/Makefile.am b/libegg/smclient/Makefile.am
index 9612c10..8aff9be 100644
--- a/libegg/smclient/Makefile.am
+++ b/libegg/smclient/Makefile.am
@@ -16,10 +16,13 @@ platform_ltlibraries =                   \
 platform_libs = libeggdesktopfile.la -lSM -lICE
 platform_sources = eggsmclient-xsmp.c
 platform_programs = egg-launch
+
+# TODO: Use GDBus from glib instead?
 if HAVE_DBUS
 platform_defines += -DEGG_SM_CLIENT_BACKEND_DBUS
 platform_sources += eggsmclient-dbus.c
 endif
+
 endif
 endif
 
diff --git a/libegg/spreadtable/Makefile.am b/libegg/spreadtable/Makefile.am
index 9eb20b8..faeef84 100644
--- a/libegg/spreadtable/Makefile.am
+++ b/libegg/spreadtable/Makefile.am
@@ -1,11 +1,11 @@
 AM_CPPFLAGS = \
-  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION \
   -DGETTEXT_PACKAGE=\"libegg\"
 
 noinst_LTLIBRARIES = libegg-spreadtable.la
 
-libegg_spreadtable_la_LIBADD = $(EGG_30_LIBS)
+libegg_spreadtable_la_LIBADD = $(EGG_LIBS)
 
 BUILT_SOURCES = eggmarshalers.c eggmarshalers.h
 
@@ -31,11 +31,11 @@ noinst_HEADERS = $(EGG_HEADERS)
 noinst_PROGRAMS = testspreadtable testspreadtablednd
 
 testspreadtable_SOURCES = testspreadtable.c
-testspreadtable_LDADD = $(EGG_30_LIBS) \
+testspreadtable_LDADD = $(EGG_LIBS) \
   $(top_builddir)/libegg/spreadtable/libegg-spreadtable.la
 
 testspreadtablednd_SOURCES = testspreadtablednd.c
-testspreadtablednd_LDADD = $(EGG_30_LIBS) \
+testspreadtablednd_LDADD = $(EGG_LIBS) \
   $(top_builddir)/libegg/spreadtable/libegg-spreadtable.la
 
 
diff --git a/libegg/thumbnailpreview/Makefile.am b/libegg/thumbnailpreview/Makefile.am
index f767436..8e6b816 100644
--- a/libegg/thumbnailpreview/Makefile.am
+++ b/libegg/thumbnailpreview/Makefile.am
@@ -2,13 +2,13 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/libegg/util \
 	-I$(top_srcdir)/libegg/pixbufthumbnail \
 	-DG_LOG_DOMAIN=\""EggThumbnailPreview"\" \
-	$(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+	$(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 noinst_LTLIBRARIES = \
 	libeggthumbnailpreview.la
 
 libeggthumbnailpreview_la_LIBADD = \
-	$(EGG_30_LIBS) \
+	$(EGG_LIBS) \
 	$(top_builddir)/libegg/pixbufthumbnail/libeggpixbufthumbnail.la
 
 libeggthumbnailpreview_la_SOURCES = \
diff --git a/libegg/toolbareditor/Makefile.am b/libegg/toolbareditor/Makefile.am
index c9c4496..a82cb56 100644
--- a/libegg/toolbareditor/Makefile.am
+++ b/libegg/toolbareditor/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
   -DCURSOR_DIR=\".\" \
-  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   $(EGG_XML_CFLAGS) \
   -DEGG_COMPILATION \
   -I$(top_builddir)/libegg/util \
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 
 noinst_LTLIBRARIES = libegg-toolbareditor.la
 
-libegg_toolbareditor_la_LIBADD = $(EGG_30_LIBS) $(EGG_XML_LIBS) \
+libegg_toolbareditor_la_LIBADD = $(EGG_LIBS) $(EGG_XML_LIBS) \
 	$(top_builddir)/libegg/util/libeggutil.la
 
 EGGSOURCES = \
@@ -40,7 +40,7 @@ noinst_PROGRAMS = test-toolbar-editor
 
 test_toolbar_editor_SOURCES = test-toolbar-editor.c
 
-test_toolbar_editor_LDADD = $(EGG_30_LIBS) \
+test_toolbar_editor_LDADD = $(EGG_LIBS) \
   $(top_builddir)/libegg/toolbareditor/libegg-toolbareditor.la
 
 # Buidl sources 
diff --git a/libegg/treeviewutils/Makefile.am b/libegg/treeviewutils/Makefile.am
index 3852872..19ce2c4 100644
--- a/libegg/treeviewutils/Makefile.am
+++ b/libegg/treeviewutils/Makefile.am
@@ -1,11 +1,11 @@
 AM_CPPFLAGS = \
-  $(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
+  $(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
   -DEGG_COMPILATION \
   -I$(top_builddir)/libegg/util
 
 noinst_LTLIBRARIES = libegg-treeview.la
 
-libegg_treeview_la_LIBADD = $(EGG_30_LIBS)
+libegg_treeview_la_LIBADD = $(EGG_LIBS)
 libegg_treeview_la_SOURCES = \
   eggaccelerators.c	\
   eggcellrendererkeys.c \
@@ -29,13 +29,13 @@ noinst_HEADERS = \
 noinst_PROGRAMS = test-tree-utils test-multi-drag test-union
 
 test_tree_utils_SOURCES = test-tree-utils.c
-test_tree_utils_LDADD = libegg-treeview.la $(EGG_30_LIBS)
+test_tree_utils_LDADD = libegg-treeview.la $(EGG_LIBS)
 test_tree_utils_DEPENDENCIES = libegg-treeview.la
 
 test_multi_drag_SOURCES = test-multi-drag.c
-test_multi_drag_LDADD = libegg-treeview.la $(EGG_30_LIBS)
+test_multi_drag_LDADD = libegg-treeview.la $(EGG_LIBS)
 test_multi_drag_DEPENDENCIES = libegg-treeview.la
 
 test_union_SOURCES = test-union.c
-test_union_LDADD = libegg-treeview.la $(EGG_30_LIBS)
+test_union_LDADD = libegg-treeview.la $(EGG_LIBS)
 test_union_DEPENDENCIES = libegg-treeview.la
diff --git a/libegg/wrapbox/Makefile.am b/libegg/wrapbox/Makefile.am
index 1f31091..a000586 100644
--- a/libegg/wrapbox/Makefile.am
+++ b/libegg/wrapbox/Makefile.am
@@ -1,9 +1,9 @@
 AM_CPPFLAGS = \
-	$(EGG_30_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
+	$(EGG_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED)
 
 noinst_LTLIBRARIES = libegg-wrapbox.la
 
-libegg_wrapbox_la_LIBADD = $(EGG_30_LIBS)
+libegg_wrapbox_la_LIBADD = $(EGG_LIBS)
 
 libegg_wrapbox_la_SOURCES = \
 	$(enum_data) \
@@ -49,7 +49,7 @@ noinst_PROGRAMS = testwrapbox
 
 testwrapbox_SOURCES = testwrapbox.c
 
-testwrapbox_LDADD = $(EGG_30_LIBS) \
+testwrapbox_LDADD = $(EGG_LIBS) \
 	libegg-wrapbox.la
 
 CLEANFILES = $(enum_data)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]