[yelp] Remove SMClient client stuff
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [yelp] Remove SMClient client stuff
- Date: Fri, 7 May 2010 15:48:47 +0000 (UTC)
commit 43818beeb26d3e0ba0d59d65205915e42696912a
Author: Javier Jardón <jjardon gnome org>
Date: Fri May 7 05:49:49 2010 +0200
Remove SMClient client stuff
The required functionality will be integrated in GtkApplication soon
configure.ac | 29 -
po/POTFILES.skip | 2 -
src/Makefile.am | 22 -
src/eggdesktopfile.c | 1477 ---------------------------------------------
src/eggsmclient-osx.c | 235 -------
src/eggsmclient-private.h | 53 --
src/eggsmclient-win32.c | 353 -----------
src/eggsmclient-xsmp.c | 1405 ------------------------------------------
src/eggsmclient.c | 610 -------------------
src/eggsmclient.h | 123 ----
10 files changed, 0 insertions(+), 4309 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 722eb96..a5ecb1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,34 +178,6 @@ fi
AC_SUBST(X_LIBS)
-# *****
-# SMClient
-# *****
-
-GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
-
-SMCLIENT_PKGS=
-AC_MSG_CHECKING([which smclient backend to use])
-AC_ARG_WITH([smclient],
- [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
- [],
- [case "$GDK_TARGET" in
- x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
- win32|quartz) with_smclient=$GDK_TARGET ;;
- *) with_smclient=no ;;
- esac])
-AC_MSG_RESULT([$with_smclient])
-
-if test "$with_smclient" != "no"; then
- PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
- AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
-fi
-
-AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
-AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
-AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
-AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
-
# Set flags
AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS"
AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS"
@@ -254,7 +226,6 @@ yelp-$VERSION:
Documentation: ${enable_gtk_doc}
Debug enabled: ${enable_debug}
Search backend: ${search_backend}
- Using SMClient: ${with_smclient}
Enable BZ2: ${enable_bz2}
Enable LZMA: ${enable_lzma}
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 830d3ca..b4e8b5c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,5 +1,3 @@
-src/eggdesktopfile.c
-src/eggsmclient.c
src/yelp-man.c
src/yelp-print.c
src/yelp-search-parser.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 12153a1..fa4cdd9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,28 +39,6 @@ yelp_LDADD = \
yelp_LDFLAGS = $(AM_LDFLAGS)
-if WITH_SMCLIENT
-yelp_SOURCES += \
- eggdesktopfile.c \
- eggdesktopfile.h \
- eggsmclient.c \
- eggsmclient.h \
- eggsmclient-private.h \
- $(NULL)
-yelp_CFLAGS += $(SMCLIENT_CFLAGS)
-yelp_LDADD += $(SMCLIENT_LIBS)
-
-if WITH_SMCLIENT_XSMP
-yelp_SOURCES += eggsmclient-xsmp.c
-yelp_CFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
-endif
-if WITH_SMCLIENT_WIN32
-yelp_SOURCES += eggsmclient-win32.c
-endif
-if WITH_SMCLIENT_QUARTZ
-yelp_SOURCES += eggsmclient-osx.c
-endif
-endif
BUILT_SOURCES = yelp-dbus.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]