remove gceph

Signed-off-by: Sage Weil <[email protected]>

configure.ac

@@ -418,23 +418,6 @@ AC_CHECK_FUNC([fallocate],
 #AC_FUNC_UTIME_NULL
 #AC_CHECK_FUNCS([bzero fchdir fdatasync floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa localtime_r memmove memset mkdir munmap pow rmdir select socket sqrt strcasecmp strchr strerror strstr utime])
 
-AC_ARG_WITH([gtk2],
-        [AS_HELP_STRING([--with-gtk2], [Build the graphical tools.  Default=yes.])],
-        [],
-        [with_gtk2=check])
-have_gtk2=no
-AS_IF([test "x$with_gtk2" != "xno"],
-        [PKG_CHECK_MODULES(GTKMM, [gtkmm-2.4 >= 2.12],
-                [have_gtk2=yes
-		AC_DEFINE([HAVE_GTK2], [1], [we have gtk2])
-		],
-                [if test "x$with_gtk2" != xcheck; then
-		    AC_MSG_FAILURE(
-			[--with-gtk2 was given, but test for gtkmm failed])
-		 fi
-		])])
-AM_CONDITIONAL(WITH_GTK2, [test "x$have_gtk2" != "xno"])
-
 AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
 
 AM_PATH_PYTHON([2.4],

debian/.gitignore

@@ -21,8 +21,6 @@
 /librbd1
 /radosgw-dbg
 /radosgw
-/gceph-dbg
-/gceph
 /obsync
 /python-ceph
 /tmp

do_autogen.sh

@@ -113,6 +113,6 @@ export CXXFLAGS
 
 ./configure \
 --prefix=/usr --sbindir=/sbin --localstatedir=/var --sysconfdir=/etc \
---with-gtk2=yes --with-debug $with_profiler --with-cryptopp --with-radosgw \
+--with-debug $with_profiler --with-cryptopp --with-radosgw \
 $CONFIGURE_FLAGS \
 || die "configure failed"

doc/source/build-prerequisites.rst

@@ -29,17 +29,16 @@ depend on the following:
 - ``libcrypto++-dev``
 - ``libcrypto++``
 - ``libexpat1-dev``
-- ``libgtkmm-2.4-dev``
 - ``pkg-config``
 - ``libcurl4-gnutls-dev``
 
 On Ubuntu, execute ``sudo apt-get install`` for each dependency that isn't installed on your host. ::
 
-	$ sudo apt-get install autotools-dev autoconf automake cdbs gcc g++ git libboost-dev libedit-dev libssl-dev libtool libfcgi libfcgi-dev libfuse-dev linux-kernel-headers libcrypto++-dev libcrypto++ libexpat1-dev libgtkmm-2.4-dev
+	$ sudo apt-get install autotools-dev autoconf automake cdbs gcc g++ git libboost-dev libedit-dev libssl-dev libtool libfcgi libfcgi-dev libfuse-dev linux-kernel-headers libcrypto++-dev libcrypto++ libexpat1-dev
 
 On Debian/Squeeze, execute ``aptitude install`` for each dependency that isn't installed on your host. ::
 
-	$ aptitude install autotools-dev autoconf automake cdbs gcc g++ git libboost-dev libedit-dev libssl-dev libtool libfcgi libfcgi-dev libfuse-dev linux-kernel-headers libcrypto++-dev libcrypto++ libexpat1-dev libgtkmm-2.4-dev
+	$ aptitude install autotools-dev autoconf automake cdbs gcc g++ git libboost-dev libedit-dev libssl-dev libtool libfcgi libfcgi-dev libfuse-dev linux-kernel-headers libcrypto++-dev libcrypto++ libexpat1-dev
 
 
 Ubuntu Requirements

src/.gitignore

@@ -73,7 +73,6 @@ acconfig.h
 /cephfs
 /ceph-coverage
 /dumpjournal
-/gceph
 /init-ceph
 /ceph-kdump-copy
 /librados-config

src/Makefile.am

@@ -105,37 +105,6 @@ ceph_SOURCES = \
 ceph_LDADD = $(LIBGLOBAL_LDA) $(LIBEDIT_LIBS)
 ceph_CXXFLAGS = ${AM_CXXFLAGS}
 
-if WITH_GTK2
-ceph_tool_guidir = ${datadir}/ceph_tool/gui_resources/
-ceph_tool_gui_DATA = \
-	tools/gui_resources/blacklist.svg \
-	tools/gui_resources/client.svg \
-	tools/gui_resources/cluster_stats_window.glade \
-	tools/gui_resources/down_osd.svg \
-	tools/gui_resources/failed_mds.svg \
-	tools/gui_resources/gui_monitor.build \
-	tools/gui_resources/gui_monitor.glade \
-	tools/gui_resources/gui_monitor_old.glade \
-	tools/gui_resources/main-window.glade \
-	tools/gui_resources/mds.svg \
-	tools/gui_resources/monitor.svg \
-	tools/gui_resources/node_stats_window.glade \
-	tools/gui_resources/osd.svg \
-	tools/gui_resources/out_osd.svg \
-	tools/gui_resources/pg.svg \
-	tools/gui_resources/stats_window.glade \
-	tools/gui_resources/stopped_mds.svg
-gceph_SOURCES = \
-	tools/common.cc \
-	mon/PGMap.cc \
-	tools/gceph.cc \
-	tools/gui.cc
-gceph_LDADD = $(LIBGLOBAL_LDA) $(LIBEDIT_LIBS) $(GTKMM_LIBS)
-gceph_CXXFLAGS = ${AM_CXXFLAGS} $(GTKMM_CFLAGS) \
-	-DCEPH_TOOL_GUIDIR="\"${ceph_tool_guidir}\""
-bin_PROGRAMS += gceph
-endif
-
 ceph_conf_SOURCES = ceph_conf.cc
 ceph_conf_LDADD = $(LIBGLOBAL_LDA)
 ceph_authtool_SOURCES = ceph_authtool.cc
@@ -1625,8 +1594,6 @@ noinst_HEADERS = \
 	rgw/rgw_user.h\
 	sample.ceph.conf\
 	tools/common.h\
-	tools/gui.h\
-	tools/gui_resources.h\
 	test/osd/RadosModel.h\
 	test/osd/Object.h\
 	test/osd/TestOpStat.h\