[vino] Convert capplet subdir to build non-recursively

[David King <davidk src gnome org>]

commit 4a2833cb8cfed0fecc11c333cbd80a5a1a23b0b8
Author: David King <amigadave amigadave com>
Date:   Tue Mar 1 20:05:38 2011 +0100

    Convert capplet subdir to build non-recursively

 .gitignore          |    4 ++-
 Makefile.am         |   54 +++++++++++++++++++++++++++++++++++++++++++----
 capplet/Makefile.am |   57 ---------------------------------------------------
 configure.ac        |    4 +-
 4 files changed, 54 insertions(+), 65 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4dee6ff..dc27fe2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ Makefile.in
 /build-aux/
 /capplet/*.o
 /capplet/.deps
-/capplet/vino-preferences
+/capplet/.dirstamp
 /capplet/vino-preferences.desktop
 /capplet/vino-preferences.desktop.in
 /common/*.o
@@ -72,3 +72,5 @@ Makefile.in
 /tools/*.o
 /tools/.deps
 /tools/vino-passwd
+/tools/.dirstamp
+/vino-preferences
diff --git a/Makefile.am b/Makefile.am
index 3f685fc..a8d41e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,53 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = server capplet tools docs po
+SUBDIRS = server tools docs po
 
 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
 
+bin_PROGRAMS = vino-preferences
+
+vino_preferences_CPPFLAGS = \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir) \
+	-DVINO_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
+	-DVINO_UIDIR=\""$(datadir)/vino"\" \
+	-DVINO_ICONDIR=\""$(datadir)/pixmaps\"" \
+	$(VINO_CAPPLET_CFLAGS) \
+	$(VINO_KEYRING_CFLAGS) \
+	$(VINO_HTTP_CFLAGS) \
+	$(VINO_LIBUNIQUE_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(DISABLE_DEPRECATED)
+
+vino_preferences_SOURCES = \
+	common/vino-dbus.h \
+	common/vino-dbus.c \
+	common/vino-keyring.h \
+	common/vino-keyring.c \
+	capplet/vino-connectivity-info.h \
+	capplet/vino-connectivity-info.c \
+	capplet/vino-url-webservice.h \
+	capplet/vino-url-webservice.c \
+	capplet/vino-radio-button.h \
+	capplet/vino-radio-button.c \
+	capplet/vino-message-box.h \
+	capplet/vino-message-box.c \
+	capplet/vino-preferences.c
+
+vino_preferences_LDADD = \
+	$(VINO_CAPPLET_LIBS) \
+	$(VINO_KEYRING_LIBS) \
+	$(VINO_LIBUNIQUE_LIBS) \
+	$(X_LIBS)
+
+uidir = $(pkgdatadir)
+dist_ui_DATA = capplet/vino-preferences.ui capplet/webservices
+
+desktopdir = $(datadir)/applications
+desktop_in_files = capplet/vino-preferences.desktop.in
+nodist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_DESKTOP_RULE@
+
 # GSettings schemas, enum files and conversion file
 gsettings_ENUM_NAMESPACE = org.gnome.Vino
 gsettings_ENUM_FILES = capplet/vino-preferences.c
@@ -13,11 +58,9 @@ gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 dist_noinst_DATA = \
+	$(desktop_in_files) \
+	\
 	common/org.gnome.Vino.gschema.xml \
-	common/vino-dbus.h \
-	common/vino-dbus.c \
-	common/vino-keyring.h \
-	common/vino-keyring.c \
 	$(gsettings_in_file) \
 	\
 	MAINTAINERS \
@@ -28,6 +71,7 @@ dist_noinst_DATA = \
 dist_noinst_SCRIPTS = autogen.sh
 
 CLEANFILES = \
+	$(nodist_desktop_DATA) \
 	$(gsettings_SCHEMAS)
 
 DISTCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index e40ae48..8ca34fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,10 +5,11 @@ AC_CONFIG_SRCDIR([server/vino-fb.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.10 -Wall no-define nostdinc])
+AM_INIT_AUTOMAKE([1.10 -Wall no-define nostdinc subdir-objects])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 AC_PROG_CC
+AM_PROG_CC_C_O
 
 # Check whether to enable HTTP server support
 AC_ARG_ENABLE([http-server],
@@ -350,7 +351,6 @@ server/libvncserver/ifaddr/Makefile
 server/libvncserver/rfb/Makefile
 server/miniupnp/Makefile
 server/smclient/Makefile
-capplet/Makefile
 capplet/vino-preferences.desktop.in
 tools/Makefile
 docs/Makefile