[vino] Convert server/smclient to build non-recursively

[David King <davidk src gnome org>]

commit ddd32f8bab270ad0c11c2cb347b6eda0cc619f9c
Author: David King <amigadave amigadave com>
Date:   Tue Mar 1 22:11:58 2011 +0100

    Convert server/smclient to build non-recursively

 .gitignore                  |    5 +++--
 Makefile.am                 |   41 ++++++++++++++++++++++++++++++++++++++---
 configure.ac                |    1 -
 server/smclient/Makefile.am |   38 --------------------------------------
 4 files changed, 41 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5b44bc5..b11a1c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,8 @@ Makefile.in
 /intltool-extract.in
 /intltool-merge.in
 /intltool-update.in
+/libeggdesktopfile.la
+/libeggsmclient.la
 /libminiupnp.la
 /libtool
 /mkinstalldirs
@@ -66,11 +68,10 @@ Makefile.in
 /server/miniupnp/.deps
 /server/miniupnp/.dirstamp
 /server/miniupnp/.libs
-/server/smclient/*.o
 /server/smclient/*.lo
 /server/smclient/.deps
+/server/smclient/.dirstamp
 /server/smclient/.libs
-/server/smclient/*.la
 /stamp-h1
 /tools/*.o
 /tools/.deps
diff --git a/Makefile.am b/Makefile.am
index 32dc398..58c4caa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,44 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = docs po server/libvncserver server/smclient
+SUBDIRS = docs po server/libvncserver
 
 DISTCHECK_CONFIGURE_FLAGS = --with-avahi --with-libnotify --with-gnome-keyring --with-network-manager --with-telepathy --with-gnutls --with-gcrypt --with-zlib --with-jpeg --enable-debug --enable-http-server
 
-noinst_LTLIBRARIES = libminiupnp.la
+smclient_platform_defines = -DEGG_SM_CLIENT_BACKEND_XSMP
+smclient_cppflags = \
+	-DG_LOG_DOMAIN=\""EggSMClient"\" \
+	$(smclient_platform_defines) \
+	$(EGG_SMCLIENT_CFLAGS) \
+	-I$(top_builddir)
+smclient_platform_libs = libeggdesktopfile.la -lSM -lICE
+smclient_platform_sources = server/smclient/eggsmclient-xsmp.c
+
+noinst_LTLIBRARIES = \
+	libeggsmclient.la \
+	libeggdesktopfile.la \
+	libminiupnp.la
+
+libeggsmclient_la_CPPFLAGS = \
+	$(smclient_cppflags)
+
+libeggsmclient_la_LIBADD = \
+	$(EGG_SMCLIENT_LIBS) \
+	$(smclient_platform_libs)
+
+libeggsmclient_la_SOURCES = \
+	server/smclient/eggsmclient.c \
+	server/smclient/eggsmclient.h \
+	server/smclient/eggsmclient-private.h \
+	$(smclient_platform_sources)
+
+libeggdesktopfile_la_CPPFLAGS = \
+	$(smclient_cppflags)
+
+libeggdesktopfile_la_LIBADD = \
+	$(EGG_LIBS)
+
+libeggdesktopfile_la_SOURCES = \
+	server/smclient/eggdesktopfile.c \
+	server/smclient/eggdesktopfile.h
 
 libminiupnp_la_CPPFLAGS = -DNDEBUG
 
@@ -55,7 +90,7 @@ libexec_PROGRAMS = vino-server
 vino_server_LDADD = \
 	$(top_builddir)/server/libvncserver/libvncserver.la \
 	libminiupnp.la \
-	$(top_builddir)/server/smclient/libeggsmclient.la \
+	libeggsmclient.la \
 	$(VINO_SERVER_LIBS) \
 	$(LIBNOTIFY_LIBS) \
 	$(KEYRING_LIBS) \
diff --git a/configure.ac b/configure.ac
index e7e5634..6f9b5a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,7 +348,6 @@ Makefile
 server/libvncserver/Makefile
 server/libvncserver/ifaddr/Makefile
 server/libvncserver/rfb/Makefile
-server/smclient/Makefile
 capplet/vino-preferences.desktop.in
 docs/Makefile
 po/Makefile.in