[vino] Convert tools subdir to build non-recursively

[David King <davidk src gnome org>]

commit c2ba6986991dabf559f522b7d64a32f175997070
Author: David King <amigadave amigadave com>
Date:   Tue Mar 1 20:49:51 2011 +0100

    Convert tools subdir to build non-recursively

 .gitignore        |    2 +-
 Makefile.am       |   18 ++++++++++++++++--
 configure.ac      |    1 -
 tools/Makefile.am |   20 --------------------
 4 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc27fe2..0e99215 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,6 +71,6 @@ Makefile.in
 /stamp-h1
 /tools/*.o
 /tools/.deps
-/tools/vino-passwd
 /tools/.dirstamp
 /vino-preferences
+/vino-passwd
diff --git a/Makefile.am b/Makefile.am
index a8d41e7..1eef1c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,10 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = server tools docs po
+SUBDIRS = server 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
+bin_PROGRAMS = vino-preferences \
+	vino-passwd
 
 vino_preferences_CPPFLAGS = \
 	-I$(top_srcdir)/common \
@@ -39,6 +40,19 @@ vino_preferences_LDADD = \
 	$(VINO_LIBUNIQUE_LIBS) \
 	$(X_LIBS)
 
+vino_passwd_CPPFLAGS = \
+	-I$(top_builddir) \
+	-DVINO_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	$(VINO_TOOLS_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(DISABLE_DEPRECATED)
+
+vino_passwd_SOURCES = \
+	tools/vino-passwd.c
+
+vino_passwd_LDADD = \
+	$(VINO_TOOLS_LIBS)
+
 uidir = $(pkgdatadir)
 dist_ui_DATA = capplet/vino-preferences.ui capplet/webservices
 
diff --git a/configure.ac b/configure.ac
index 8ca34fe..2aa2917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -352,7 +352,6 @@ server/libvncserver/rfb/Makefile
 server/miniupnp/Makefile
 server/smclient/Makefile
 capplet/vino-preferences.desktop.in
-tools/Makefile
 docs/Makefile
 po/Makefile.in
 ])