[vino] Convert common subdir to build non-recursively

[David King <davidk src gnome org>]

commit fcd3a6e801b2b369bd7bc0adda5306a567d7740c
Author: David King <amigadave amigadave com>
Date:   Tue Mar 1 19:47:25 2011 +0100

    Convert common subdir to build non-recursively

 .gitignore         |    5 ++++-
 Makefile.am        |   40 ++++++++++++++++++++++++++++++++--------
 common/Makefile.am |   23 -----------------------
 configure.ac       |    1 -
 4 files changed, 36 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3e1e37..4dee6ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,9 @@ Makefile.in
 /capplet/vino-preferences
 /capplet/vino-preferences.desktop
 /capplet/vino-preferences.desktop.in
-/common/org.gnome.Vino.enums.xml
+/common/*.o
+/common/.deps
+/common/.dirstamp
 /common/org.gnome.Vino.gschema.xml
 /config.log
 /config.h
@@ -26,6 +28,7 @@ Makefile.in
 /libtool
 /mkinstalldirs
 /m4/
+/org.gnome.Vino.enums.xml
 /po/.intltool-merge-cache
 /po/Makefile.in.in
 /po/Makevars.template
diff --git a/Makefile.am b/Makefile.am
index 711e837..3f685fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,39 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = common server capplet tools docs po
+SUBDIRS = server capplet 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
 
-EXTRA_DIST =                \
-	MAINTAINERS         \
+# GSettings schemas, enum files and conversion file
+gsettings_ENUM_NAMESPACE = org.gnome.Vino
+gsettings_ENUM_FILES = capplet/vino-preferences.c
+gsettings_in_file = common/org.gnome.Vino.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+
+ INTLTOOL_XML_NOMERGE_RULE@
+ GSETTINGS_RULES@
+
+dist_noinst_DATA = \
+	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 \
 	intltool-extract.in \
-	intltool-merge.in   \
+	intltool-merge.in \
 	intltool-update.in
 
-DISTCLEANFILES =		\
-	intltool-extract	\
-	intltool-merge		\
-	intltool-update
+dist_noinst_SCRIPTS = autogen.sh
+
+CLEANFILES = \
+	$(gsettings_SCHEMAS)
+
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update \
+	po/.intltool-merge-cache
+
+MAINTAINERCLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
diff --git a/configure.ac b/configure.ac
index 4e2df6c..e40ae48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -344,7 +344,6 @@ GLIB_GSETTINGS
 
 AC_CONFIG_FILES([
 Makefile
-common/Makefile
 server/Makefile
 server/libvncserver/Makefile
 server/libvncserver/ifaddr/Makefile