[build] Reorganised to use non-recursive automake and added gcov support

Reorganised to use non-recursive automake for everything except API
documentation and translations. As a consequence of this reorganisation, two
private header files which were mistakenly installed before are no longer
installed (this will not be considered an API break). The introspection and
gtester include files have been updated.

Support for code coverage checking for the test suite has been added too,
using gcov. It can be invoked by `make gcov`, and will output a file called
"gcov-report.txt" in the main source directory with the results of the
checks.

20 files changed, 589 insertions, 781 deletions

diff --git a/INSTALL b/INSTALL
index 23e5f25d..2550dab7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,19 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -23,9 +26,9 @@ debugging `configure').
 
    It can also use an optional file (typically called `config.cache'
 and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  (Caching is
+the results of its tests to speed up reconfiguring.  Caching is
 disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
 
    If you need to do unusual things to compile the package, please try
 to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
    The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
 
 The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.  If you're
-     using `csh' on an old version of System V, you might need to type
-     `sh ./configure' instead to prevent `csh' from trying to execute
-     `configure' itself.
+     `./configure' to configure the package for your system.
 
-     Running `configure' takes awhile.  While running, it prints some
-     messages telling which features it is checking for.
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
 
   2. Type `make' to compile the package.
 
@@ -67,42 +67,57 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  6. Often, you can also type `make uninstall' to remove the installed
+     files again.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
 is an example:
 
-     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
    *Note Defining Variables::, for more details.
 
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
 source code in the directory that `configure' is in and in `..'.
 
-   If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory.  After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
 
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
 `configure' the option `--prefix=PREFIX'.
@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -137,14 +152,46 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -152,7 +199,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -170,9 +218,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +229,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -190,21 +238,29 @@ them in the `configure' command line, using `VAR=value'.  For example:
      ./configure CC=/usr/local2/bin/gcc
 
 causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -231,6 +287,16 @@ configuration-related scripts to be executed by `/bin/bash'.
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *Note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
diff --git a/Makefile.am b/Makefile.am
index cc650725..add15a50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,436 @@
-SUBDIRS = gdata po docs
+SUBDIRS = . gdata/tests po docs
 
-EXTRA_DIST = \
+DISTCHECK_CONFIGURE_FLAGS =
+MAINTAINERCLEANFILES =
+
+# Marshalling
+GDATA_MARSHAL_FILES = \
+	gdata/gdata-marshal.c	\
+	gdata/gdata-marshal.h
+
+gdata/gdata-marshal.h: gdata/gdata-marshal.list Makefile
+	$(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=gdata_marshal gdata/gdata-marshal.list --header > $@)
+gdata/gdata-marshal.c: gdata/gdata-marshal.h Makefile
+	$(AM_V_GEN)($(GLIB_GENMARSHAL) --prefix=gdata_marshal gdata/gdata-marshal.list --header --body > $@)
+
+EXTRA_DIST = gdata/gdata-marshal.list
+CLEANFILES = $(GDATA_MARSHAL_FILES)
+
+# Enums
+GDATA_ENUM_FILES = \
+	gdata/gdata-enums.c					\
+	gdata/gdata-enums.h					\
+	gdata/media/gdata-media-enums.c				\
+	gdata/media/gdata-media-enums.h				\
+	gdata/services/documents/gdata-documents-enums.c	\
+	gdata/services/documents/gdata-documents-enums.h	\
+	gdata/services/picasaweb/gdata-picasaweb-enums.c	\
+	gdata/services/picasaweb/gdata-picasaweb-enums.h	\
+	gdata/services/youtube/gdata-youtube-enums.c		\
+	gdata/services/youtube/gdata-youtube-enums.h
+
+gdata/gdata-enums.h: $(gdata_headers) Makefile
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#ifndef GDATA_ENUMS_H\n#define GDATA_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+			--fprod "/* enumerations from \"@filename@\" */\n" \
+			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+			--ftail "G_END_DECLS\n\n#endif /* !GDATA_ENUMS_H */" $(gdata_headers) > $@.tmp \
+	&& sed "s/g_data/gdata/" $@.tmp > $@ \
+	&& rm -f $@.tmp)
+
+gdata/gdata-enums.c: $(gdata_headers) Makefile gdata/gdata-enums.h
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#include \"gdata-service.h\"\n#include \"gdata-parsable.h\"\n#include \"gdata-enums.h\"" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(gdata_headers) > $@.tmp \
+	&& sed "s/g_data/gdata/" $@.tmp > $@ \
+	&& rm -f $@.tmp)
+
+gdata/media/gdata-media-enums.h: $(gdata_media_headers) Makefile
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#ifndef GDATA_MEDIA_ENUMS_H\n#define GDATA_MEDIA_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+			--fprod "/* enumerations from \"@filename@\" */\n" \
+			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+			--ftail "G_END_DECLS\n\n#endif /* !GDATA_MEDIA_ENUMS_H */" \
+		$(gdata_media_headers) > $@.tmp \
+	&& sed "s/g_data/gdata/" $@.tmp > $@.tmp2 \
+	&& sed "s/GDATA_TYPE_DATA/GDATA_TYPE/" $@.tmp2 > $@ \
+	&& rm -f $@.tmp \
+	&& rm -f $@.tmp2)
+
+gdata/media/gdata-media-enums.c: $(gdata_media_headers) Makefile gdata/media/gdata-media-enums.h
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#include \"gdata-media-content.h\"\n#include \"gdata-media-enums.h\"" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(gdata_media_headers) > $@.tmp \
+	&& sed "s/g_data/gdata/" $@.tmp > $@ \
+	&& rm -f $@.tmp)
+
+gdata/services/documents/gdata-documents-enums.h: $(gdata_documents_headers) Makefile
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#ifndef GDATA_DOCUMENTS_ENUMS_H\n#define GDATA_DOCUMENTS_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+			--fprod "/* enumerations from \"@filename@\" */\n" \
+			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+			--ftail "G_END_DECLS\n\n#endif /* !GDATA_DOCUMENTS_ENUMS_H */" \
+		$(gdata_documents_headers) > $@.tmp \
+	&& sed "s/g_data/gdata/" $@.tmp > $@ \
+	&& rm -f $@.tmp)
+
+gdata/services/documents/gdata-documents-enums.c: $(gdata_documents_headers) Makefile gdata/services/documents/gdata-documents-enums.h
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#include \"gdata-documents-service.h\"\n#include \"gdata-documents-text.h\"\n#include \"gdata-documents-spreadsheet.h\"\n#include \"gdata-documents-presentation.h\"\n#include \"gdata-documents-enums.h\"" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(gdata_documents_headers) > $@.tmp \
+	&& sed "s/g_data/gdata/" $@.tmp > $@ \
+	&& rm -f $@.tmp)
+
+gdata/services/picasaweb/gdata-picasaweb-enums.h: $(gdata_picasaweb_headers) Makefile
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#ifndef GDATA_PICASAWEB_ENUMS_H\n#define GDATA_PICASAWEB_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+			--fprod "/* enumerations from \"@filename@\" */\n" \
+			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+			--ftail "G_END_DECLS\n\n#endif /* !GDATA_PICASAWEB_ENUMS_H */" \
+		$(gdata_picasaweb_headers) > $@.tmp \
+	&& sed "s/g_data_picasa_web/gdata_picasaweb/" $@.tmp > $@.tmp2 \
+	&& sed "s/GDATA_TYPE_DATA_PICASA_WEB/GDATA_TYPE_PICASAWEB/" $@.tmp2 > $@ \
+	&& rm -f $@.tmp \
+	&& rm -f $@.tmp2)
+
+gdata/services/picasaweb/gdata-picasaweb-enums.c: $(gdata_picasaweb_headers) Makefile gdata/services/picasaweb/gdata-picasaweb-enums.h
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#include \"gdata-picasaweb-album.h\"\n#include \"gdata-picasaweb-enums.h\"" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(gdata_picasaweb_headers) > $@.tmp \
+	&& sed "s/g_data_picasa_web/gdata_picasaweb/" $@.tmp > $@ \
+	&& rm -f $@.tmp)
+
+gdata/services/youtube/gdata-youtube-enums.h: $(gdata_youtube_headers) Makefile
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#ifndef GDATA_YOUTUBE_ENUMS_H\n#define GDATA_YOUTUBE_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+			--fprod "/* enumerations from \"@filename@\" */\n" \
+			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
+			--ftail "G_END_DECLS\n\n#endif /* !GDATA_YOUTUBE_ENUMS_H */" \
+		$(gdata_youtube_headers) > $@.tmp \
+	&& sed "s/g_data_you_tube/gdata_youtube/" $@.tmp > $@.tmp2 \
+	&& sed "s/GDATA_TYPE_DATA_YOU_TUBE/GDATA_TYPE_YOUTUBE/" $@.tmp2 > $@ \
+	&& rm -f $@.tmp \
+	&& rm -f $@.tmp2)
+
+gdata/services/youtube/gdata-youtube-enums.c: $(gdata_youtube_headers) Makefile gdata/services/youtube/gdata-youtube-enums.h
+	$(AM_V_GEN)($(GLIB_MKENUMS) \
+			--fhead "#include \"gdata-youtube-service.h\"\n#include \"gdata-youtube-query.h\"\n#include \"gdata-youtube-enums.h\"" \
+			--fprod "\n/* enumerations from \"@filename@\" */" \
+			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
+			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
+		$(gdata_youtube_headers) > $@.tmp \
+	&& sed "s/g_data_you_tube/gdata_youtube/" $@.tmp > $@ \
+	&& rm -f $@.tmp)
+
+CLEANFILES += $(GDATA_ENUM_FILES)
+
+# libgdata library
+lib_LTLIBRARIES = gdata/libgdata.la
+
+gdataincludedir = $(pkgincludedir)/gdata
+gdata_headers = \
+	gdata/gdata.h			\
+	gdata/gdata-entry.h		\
+	gdata/gdata-feed.h		\
+	gdata/gdata-service.h		\
+	gdata/gdata-query.h		\
+	gdata/gdata-access-handler.h	\
+	gdata/gdata-access-rule.h	\
+	gdata/gdata-parsable.h		\
+	gdata/gdata-download-stream.h	\
+	gdata/gdata-upload-stream.h
+# The following headers are private, and shouldn't be installed:
+#	gdata/gdata-private.h		\
+#	gdata/gdata-parser.h		\
+#	gdata/gdata-buffer.h		\
+#	gdata/exif/gdata-exif-tags.h	\
+#	gdata/georss/gdata-georss-where.h
+gdatainclude_HEADERS = \
+	$(gdata_headers)	\
+	gdata/gdata-enums.h	\
+	gdata/gdata-types.h
+
+gdataatomincludedir = $(gdataincludedir)/atom
+gdataatominclude_HEADERS = \
+	gdata/atom/gdata-author.h	\
+	gdata/atom/gdata-category.h	\
+	gdata/atom/gdata-generator.h	\
+	gdata/atom/gdata-link.h
+
+gdatagdincludedir = $(gdataincludedir)/gd
+gdatagdinclude_HEADERS = \
+	gdata/gd/gdata-gd-email-address.h	\
+	gdata/gd/gdata-gd-im-address.h		\
+	gdata/gd/gdata-gd-organization.h	\
+	gdata/gd/gdata-gd-phone-number.h	\
+	gdata/gd/gdata-gd-postal-address.h	\
+	gdata/gd/gdata-gd-reminder.h		\
+	gdata/gd/gdata-gd-when.h		\
+	gdata/gd/gdata-gd-where.h		\
+	gdata/gd/gdata-gd-who.h			\
+	gdata/gd/gdata-gd-name.h
+
+gdatamediaincludedir = $(gdataincludedir)/media
+gdata_media_headers = \
+	gdata/media/gdata-media-category.h	\
+	gdata/media/gdata-media-content.h	\
+	gdata/media/gdata-media-credit.h	\
+	gdata/media/gdata-media-thumbnail.h
+# The following headers are private, and shouldn't be installed:
+#	gdata/media/gdata-media-group.h
+gdatamediainclude_HEADERS = \
+	$(gdata_media_headers)		\
+	gdata/media/gdata-media-enums.h
+
+gdatacalendarincludedir = $(gdataincludedir)/services/calendar
+gdatacalendarinclude_HEADERS = \
+	gdata/services/calendar/gdata-calendar-service.h	\
+	gdata/services/calendar/gdata-calendar-calendar.h	\
+	gdata/services/calendar/gdata-calendar-event.h		\
+	gdata/services/calendar/gdata-calendar-query.h		\
+	gdata/services/calendar/gdata-calendar-feed.h
+
+gdatacontactsincludedir = $(gdataincludedir)/services/contacts
+gdatacontactsinclude_HEADERS = \
+	gdata/services/contacts/gdata-contacts-service.h	\
+	gdata/services/contacts/gdata-contacts-contact.h	\
+	gdata/services/contacts/gdata-contacts-query.h
+
+gdatadocumentsincludedir = $(gdataincludedir)/services/documents
+gdata_documents_headers = \
+	gdata/services/documents/gdata-documents-service.h	\
+	gdata/services/documents/gdata-documents-feed.h		\
+	gdata/services/documents/gdata-documents-entry.h	\
+	gdata/services/documents/gdata-documents-query.h	\
+	gdata/services/documents/gdata-documents-text.h		\
+	gdata/services/documents/gdata-documents-presentation.h	\
+	gdata/services/documents/gdata-documents-folder.h	\
+	gdata/services/documents/gdata-documents-spreadsheet.h
+gdatadocumentsinclude_HEADERS = \
+	$(gdata_documents_headers)				\
+	gdata/services/documents/gdata-documents-enums.h
+
+gdatapicasawebincludedir = $(gdataincludedir)/services/picasaweb
+gdata_picasaweb_headers = \
+	gdata/services/picasaweb/gdata-picasaweb-service.h	\
+	gdata/services/picasaweb/gdata-picasaweb-query.h	\
+	gdata/services/picasaweb/gdata-picasaweb-file.h		\
+	gdata/services/picasaweb/gdata-picasaweb-album.h	\
+	gdata/services/picasaweb/gdata-picasaweb-user.h		\
+	gdata/services/picasaweb/gdata-picasaweb-feed.h
+gdatapicasawebinclude_HEADERS = \
+	$(gdata_picasaweb_headers)				\
+	gdata/services/picasaweb/gdata-picasaweb-enums.h
+
+gdatayoutubeincludedir = $(gdataincludedir)/services/youtube
+gdata_youtube_headers = \
+	gdata/services/youtube/gdata-youtube-service.h	\
+	gdata/services/youtube/gdata-youtube-video.h	\
+	gdata/services/youtube/gdata-youtube-content.h	\
+	gdata/services/youtube/gdata-youtube-credit.h	\
+	gdata/services/youtube/gdata-youtube-query.h	\
+	gdata/services/youtube/gdata-youtube-state.h
+# The following headers are private, and shouldn't be installed:
+#	gdata/services/youtube/gdata-youtube-group.h	\
+#	gdata/services/youtube/gdata-youtube-control.h
+gdatayoutubeinclude_HEADERS = \
+	$(gdata_youtube_headers)			\
+	gdata/services/youtube/gdata-youtube-enums.h
+
+gdata_libgdata_la_SOURCES = \
+	$(GDATA_MARSHAL_FILES)		\
+	$(GDATA_ENUM_FILES)		\
+	gdata/gdata-entry.c		\
+	gdata/gdata-feed.c		\
+	gdata/gdata-service.c		\
+	gdata/gdata-types.c		\
+	gdata/gdata-query.c		\
+	gdata/gdata-parser.c		\
+	gdata/gdata-access-handler.c	\
+	gdata/gdata-access-rule.c	\
+	gdata/gdata-parsable.c		\
+	gdata/gdata-download-stream.c	\
+	gdata/gdata-upload-stream.c	\
+	gdata/gdata-buffer.c		\
+	\
+	gdata/atom/gdata-author.c	\
+	gdata/atom/gdata-category.c	\
+	gdata/atom/gdata-generator.c	\
+	gdata/atom/gdata-link.c		\
+	\
+	gdata/exif/gdata-exif-tags.c	\
+	\
+	gdata/gd/gdata-gd-email-address.c	\
+	gdata/gd/gdata-gd-im-address.c		\
+	gdata/gd/gdata-gd-organization.c	\
+	gdata/gd/gdata-gd-phone-number.c	\
+	gdata/gd/gdata-gd-postal-address.c	\
+	gdata/gd/gdata-gd-reminder.c		\
+	gdata/gd/gdata-gd-when.c		\
+	gdata/gd/gdata-gd-where.c		\
+	gdata/gd/gdata-gd-who.c			\
+	gdata/gd/gdata-gd-name.c		\
+	\
+	gdata/georss/gdata-georss-where.c	\
+	\
+	gdata/media/gdata-media-category.c	\
+	gdata/media/gdata-media-content.c	\
+	gdata/media/gdata-media-credit.c	\
+	gdata/media/gdata-media-thumbnail.c	\
+	gdata/media/gdata-media-group.c		\
+	\
+	gdata/services/calendar/gdata-calendar-service.c	\
+	gdata/services/calendar/gdata-calendar-calendar.c	\
+	gdata/services/calendar/gdata-calendar-event.c		\
+	gdata/services/calendar/gdata-calendar-query.c		\
+	gdata/services/calendar/gdata-calendar-feed.c		\
+	\
+	gdata/services/contacts/gdata-contacts-service.c	\
+	gdata/services/contacts/gdata-contacts-contact.c	\
+	gdata/services/contacts/gdata-contacts-query.c		\
+	\
+	gdata/services/documents/gdata-documents-service.c	\
+	gdata/services/documents/gdata-documents-feed.c		\
+	gdata/services/documents/gdata-documents-entry.c	\
+	gdata/services/documents/gdata-documents-text.c		\
+	gdata/services/documents/gdata-documents-presentation.c	\
+	gdata/services/documents/gdata-documents-spreadsheet.c	\
+	gdata/services/documents/gdata-documents-folder.c	\
+	gdata/services/documents/gdata-documents-query.c	\
+	\
+	gdata/services/picasaweb/gdata-picasaweb-album.c	\
+	gdata/services/picasaweb/gdata-picasaweb-query.c	\
+	gdata/services/picasaweb/gdata-picasaweb-file.c		\
+	gdata/services/picasaweb/gdata-picasaweb-service.c	\
+	gdata/services/picasaweb/gdata-picasaweb-user.c		\
+	gdata/services/picasaweb/gdata-picasaweb-feed.c		\
+	\
+	gdata/services/youtube/gdata-youtube-service.c		\
+	gdata/services/youtube/gdata-youtube-video.c		\
+	gdata/services/youtube/gdata-youtube-content.c		\
+	gdata/services/youtube/gdata-youtube-credit.c		\
+	gdata/services/youtube/gdata-youtube-query.c		\
+	gdata/services/youtube/gdata-youtube-group.c		\
+	gdata/services/youtube/gdata-youtube-state.c		\
+	gdata/services/youtube/gdata-youtube-control.c
+
+gdata_libgdata_la_CPPFLAGS = \
+	-I$(top_srcdir)			\
+	-I$(top_srcdir)/gdata		\
+	-DG_LOG_DOMAIN=\"libgdata\"	\
+	$(DISABLE_DEPRECATED)		\
+	$(AM_CPPFLAGS)
+
+gdata_libgdata_la_CFLAGS = \
+	$(GDATA_CFLAGS)	\
+	$(GNOME_CFLAGS)	\
+	$(WARN_CFLAGS)	\
+	$(AM_CFLAGS)
+
+gdata_libgdata_la_LIBADD = \
+	$(GDATA_LIBS)	\
+	$(GNOME_LIBS)	\
+	$(AM_LIBADD)
+
+gdata_libgdata_la_LDFLAGS = \
+	-version-info $(GDATA_LT_VERSION)	\
+	-export-symbols gdata/gdata.symbols	\
+	-no-undefined				\
+	$(AM_LDFLAGS)
+
+EXTRA_DIST += gdata/gdata.symbols
+
+# Introspection
+if HAVE_INTROSPECTION
+gdata/GData-$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR).gir: Makefile gdata/libgdata.la
+	$(AM_V_GEN)($(INTROSPECTION_SCANNER)						\
+	--namespace GData --nsversion=$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR)	\
+	--strip-prefix=GData								\
+	--c-include="gdata/gdata.h" --include=libxml2-2.0 --include=Soup-2.4		\
+	--library=gdata --output $@ --pkg libgdata					\
+	-I$(top_srcdir) -I$(top_srcdir)/gdata						\
+	$(gdatainclude_HEADERS) $(gdataatominclude_HEADERS) $(gdatagdinclude_HEADERS)	\
+	$(gdatamediainclude_HEADERS) $(gdatacalendarinclude_HEADERS)			\
+	$(gdatacontactsinclude_HEADERS) $(gdatadocumentsinclude_HEADERS)		\
+	$(gdatapicasawebinclude_HEADERS) $(gdatayoutubeinclude_HEADERS))
+BUILT_GIRSOURCES = gdata/GData-$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR).gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(BUILT_GIRSOURCES)
+
+typelibsdir = $(libdir)/girepository-1.0/
+typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+
+%.typelib: %.gir
+	$(AM_V_GEN)($(INTROSPECTION_COMPILER) --includedir=gdata --includedir=. $(INTROSPECTION_COMPILER_ARGS) $< -o $@)
+
+CLEANFILES += \
+	$(BUILT_GIRSOURCES)	\
+	$(typelibs_DATA)
+
+EXTRA_DIST += introspection.m4
+DISTCHECK_CONFIGURE_FLAGS += --enable-introspection
+endif
+
+# gcov
+if GCOV_ENABLED
+gcov-report.txt: gcov-clean all check
+	$(AM_V_GEN)(rm -f $@; \
+	echo -e "Test coverage for libgdata:\n" >> $@; \
+	total_covered=0; total_actual=0; \
+	for file in $(filter %.c,$(gdata_libgdata_la_SOURCES)); do \
+	  file2=$${file##*/}; \
+	  cd $(abs_srcdir)/$${file%/*}; \
+	  gcov -o `find -newer $$file2 -name "*-$${file2/.c/.gcda}" -print0 | sed -e 's/\.gcda/\.o/'` $$file2 > /dev/null; \
+	  if test -f $$file2.gcov; then \
+	    actual=`grep -v '        -:' $$file2.gcov  | wc -l`; \
+	    uncovered=`grep '#####:' $$file2.gcov | wc -l`; \
+	    covered=$$((actual - uncovered)); \
+	    total_covered=$$((total_covered + covered)); \
+	    total_actual=$$((total_actual + actual)); \
+	    echo -e "$$file:\t$$covered / $$actual\t($$((($$covered * 100) / $$actual))%)"; \
+	  fi \
+	done >> $@; \
+	cd $(abs_srcdir); \
+	echo -e "\nSource lines: $$total_actual\nCovered statements: $$total_covered\nTotal coverage: $$((($$total_covered * 100) / $$total_actual))%" >> $@)
+
+gcov: gcov-report.txt
+	@cat gcov-report.txt
+
+clean: gcov-clean
+gcov-clean:
+	@find . -name "*.gcda" -o -name "*.gcov" -delete
+
+MAINTAINERCLEANFILES += gcov-report.txt
+
+.PHONEY: gcov gcov-clean gcov-report.txt
+else
+gcov:
+	@echo "Need to reconfigure with --enable-gcov"
+endif
+
+# Cleaning
+clean-local:
+	rm -f *~ *.bb *.bbg *.da .libs/*.da .libs/*.bbg
+
+EXTRA_DIST += \
 	COPYING.LIB		\
 	autogen.sh		\
 	intltool-extract.in	\
@@ -10,11 +440,7 @@ EXTRA_DIST = \
 	NEWS			\
 	HACKING			\
 	gtk-doc.make		\
-	libgdata.pc.in		\
-	libgdata.doap		\
-	introspection.m4
-
-CLEANFILES = gdata.pc
+	libgdata.doap
 
 DISTCLEANFILES = \
 	intltool-extract	\
@@ -23,7 +449,7 @@ DISTCLEANFILES = \
 	gnome-doc-utils.make	\
 	gtk-doc.make
 
-MAINTAINERCLEANFILES = \
+MAINTAINERCLEANFILES += \
 	INSTALL		\
 	aclocal.m4	\
 	compile		\
@@ -37,13 +463,16 @@ MAINTAINERCLEANFILES = \
 	mkinstalldirs	\
 	omf.make	\
 	gtk-doc.make	\
-	ChangeLog	\
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
+DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc
+
+# pkgconfig data
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgdata.pc
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+CLEANFILES += $(pkgconfig_DATA)
+EXTRA_DIST += libgdata.pc.in
 
 # ChangeLog
 ChangeLog: $(srcdir)/ChangeLog
@@ -63,5 +492,6 @@ $(srcdir)/ChangeLog:
 	fi
 .PHONY: $(srcdir)/ChangeLog
 
+MAINTAINERCLEANFILES += ChangeLog
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index fca8fc2b..e6a63b3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,6 @@ AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news subdir-objects])
 # Enable silent build when available (Automake 1.11)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
-
 GETTEXT_PACKAGE=gdata
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define to the Gettext package name])
 AC_SUBST(GETTEXT_PACKAGE)
@@ -82,6 +81,23 @@ fi
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
 
+# Code testing coverage with gcov
+AC_MSG_CHECKING(whether to build with gcov testing)
+AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov], [Whether to enable gcov testing]),, enable_gcov=no)
+			
+if test "x$enable_gcov" = "xyes"; then
+	if test "$GCC" = "no"; then
+		AC_MSG_ERROR(not compiling with gcc, which is required for gcov testing)
+	fi
+
+	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+	LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
+fi
+
+AM_CONDITIONAL(GCOV_ENABLED, test x$enable_gcov = xyes)
+AC_MSG_RESULT($enable_gcov)
+
+# General GNOME macros
 GNOME_COMMON_INIT
 GNOME_DEBUG_CHECK
 GNOME_COMPILE_WARNINGS([maximum])
@@ -100,18 +116,6 @@ GTK_DOC_CHECK(1.0)
 AC_OUTPUT([
 Makefile
 libgdata.pc
-gdata/Makefile
-gdata/atom/Makefile
-gdata/gd/Makefile
-gdata/media/Makefile
-gdata/exif/Makefile
-gdata/georss/Makefile
-gdata/services/Makefile
-gdata/services/calendar/Makefile
-gdata/services/contacts/Makefile
-gdata/services/documents/Makefile
-gdata/services/picasaweb/Makefile
-gdata/services/youtube/Makefile
 gdata/tests/Makefile
 po/Makefile.in
 docs/Makefile
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 65d47c1e..bb87103b 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -98,12 +98,14 @@ SCANOBJ_FILES += $(DOC_MODULE).types
 # This should also be dealt with elsewhere, but we can't call gtkdocize
 # with --flavour=no-tmpl because of gnome-autogen.sh being out of our
 # control. Grrr.
-distclean-local:
+distclean-local: distclean-docs
+distclean-docs:
 	cd $(srcdir) && \
 	  rm -rf xml tmpl $(REPORT_FILES) \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
 
-maintainer-clean-local: clean
+maintainer-clean-local: maintainer-clean-docs
+maintainer-clean-docs: clean
 	cd $(srcdir) && rm -rf xml tmpl html
 
 GITIGNOREFILES = tmpl/
diff --git a/gdata/Makefile.am b/gdata/Makefile.am
deleted file mode 100644
index 9f34db2d..00000000
--- a/gdata/Makefile.am
+++ /dev/null
@@ -1,155 +0,0 @@
-SUBDIRS = atom gd media exif georss services . tests
-DIST_SUBDIRS = atom gd media exif georss services tests
-
-# Marshalling
-GDATA_MARSHAL_FILES = \
-	gdata-marshal.c	\
-	gdata-marshal.h
-
-GLIB_GENMARSHAL = `pkg-config --variable=glib_genmarshal glib-2.0`
-
-gdata-marshal.h: gdata-marshal.list Makefile
-	$(AM_V_GEN)( $(GLIB_GENMARSHAL) --prefix=gdata_marshal $(srcdir)/gdata-marshal.list --header > gdata-marshal.h )
-gdata-marshal.c: gdata-marshal.h Makefile
-	$(AM_V_GEN)( $(GLIB_GENMARSHAL) --prefix=gdata_marshal $(srcdir)/gdata-marshal.list --header --body > gdata-marshal.c )
-
-# Enums
-GDATA_ENUM_FILES = \
-	gdata-enums.c	\
-	gdata-enums.h
-
-gdata-enums.h: $(gdata_headers) Makefile
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef GDATA_ENUMS_H\n#define GDATA_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* !GDATA_ENUMS_H */" $(gdata_headers)) > gdata-enums.h.tmp \
-	&& sed "s/g_data/gdata/" gdata-enums.h.tmp > gdata-enums.h \
-	&& rm -f gdata-enums.h.tmp
-
-gdata-enums.c: $(gdata_headers) Makefile gdata-enums.h
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#include \"gdata.h\"\n#include \"gdata-enums.h\"" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(gdata_headers)) > gdata-enums.c.tmp \
-	&& sed "s/g_data/gdata/" gdata-enums.c.tmp > gdata-enums.c \
-	&& rm -f gdata-enums.c.tmp
-
-# libgdata library
-lib_LTLIBRARIES = libgdata.la
-
-gdata_headers = \
-	gdata.h			\
-	gdata-entry.h		\
-	gdata-feed.h		\
-	gdata-service.h		\
-	gdata-query.h		\
-	gdata-access-handler.h	\
-	gdata-access-rule.h	\
-	gdata-parsable.h	\
-	gdata-download-stream.h	\
-	gdata-upload-stream.h
-
-gdataincludedir = $(pkgincludedir)/gdata
-gdatainclude_HEADERS = \
-	$(gdata_headers)	\
-	gdata-enums.h		\
-	gdata-types.h
-
-libgdata_la_SOURCES = \
-	$(GDATA_MARSHAL_FILES)	\
-	$(GDATA_ENUM_FILES)	\
-	gdata-entry.c		\
-	gdata-feed.c		\
-	gdata-service.c		\
-	gdata-types.c		\
-	gdata-query.c		\
-	gdata-parser.c		\
-	gdata-access-handler.c	\
-	gdata-access-rule.c	\
-	gdata-parsable.c	\
-	gdata-download-stream.c	\
-	gdata-upload-stream.c	\
-	gdata-private.h		\
-	gdata-parser.h		\
-	gdata-buffer.c		\
-	gdata-buffer.h
-
-libgdata_la_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdata		\
-	-DG_LOG_DOMAIN=\"libgdata\"	\
-	$(DISABLE_DEPRECATED)		\
-	$(AM_CPPFLAGS)
-
-libgdata_la_CFLAGS = \
-	$(GDATA_CFLAGS)			\
-	$(GNOME_CFLAGS)			\
-	$(WARN_CFLAGS)			\
-	$(AM_CFLAGS)			\
-	-D_GNU_SOURCE
-
-libgdata_la_LIBADD = \
-	$(GDATA_LIBS)				\
-	$(GNOME_LIBS)				\
-	atom/libgdataatom.la			\
-	gd/libgdatagd.la			\
-	media/libgdatamedia.la			\
-	exif/libgdataexif.la			\
-	georss/libgdatageorss.la		\
-	services/youtube/libgdatayoutube.la	\
-	services/calendar/libgdatacalendar.la	\
-	services/picasaweb/libgdatapicasaweb.la	\
-	services/documents/libgdatadocuments.la \
-	services/contacts/libgdatacontacts.la
-
-libgdata_la_LDFLAGS = \
-	-version-info $(GDATA_LT_VERSION)	\
-	-export-symbols $(srcdir)/gdata.symbols \
-	-no-undefined				\
-	$(AM_LDFLAGS)
-
-# General cleanup
-CLEANFILES = \
-	$(GDATA_ENUM_FILES)	\
-	$(GDATA_MARSHAL_FILES)
-EXTRA_DIST = \
-	gdata.symbols	\
-	gdata-marshal.list
-
-# Introspection
-
-if HAVE_INTROSPECTION
-GData-$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR).gir: $(INTROSPECTION_SCANNER) libgdata.la
-	$(AM_V_GEN)($(INTROSPECTION_SCANNER) -v						\
-	--namespace GData --nsversion=$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR)	\
-	--strip-prefix=GData --add-include-path=$(srcdir) --add-include=path=.		\
-	--c-include="gdata/gdata.h" --include=libxml2-2.0 --include=Soup-2.4		\
-	--library=gdata --output $@ --pkg gobject-2.0					\
-	-I$(top_srcdir)									\
-	-I$(top_srcdir)/gdata								\
-	`find -name "*.[ch]" | grep -vE ".*/gdata-(youtube-control|media-group|youtube-group|georss-where|exif-tags)\.[ch]"`)
-# The files listed above are excluded because they're currently private
-
-BUILT_GIRSOURCES = GData-$(GDATA_VERSION_MAJOR).$(GDATA_VERSION_MINOR).gir
-
-# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
-# install anything - we need to install inside our prefix.
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
-
-typelibsdir = $(libdir)/girepository-1.0/
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(AM_V_GEN)($(INTROSPECTION_COMPILER)	\
-	--includedir=$(srcdir) --includedir=.		\
-	$(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F))
-
-CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/atom/Makefile.am b/gdata/atom/Makefile.am
deleted file mode 100644
index 4a6fcf5f..00000000
--- a/gdata/atom/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-gdataatomincludedir = $(pkgincludedir)/gdata/atom
-gdataatominclude_HEADERS = \
-	gdata-author.h		\
-	gdata-category.h	\
-	gdata-generator.h	\
-	gdata-link.h
-
-noinst_LTLIBRARIES = libgdataatom.la
-
-libgdataatom_la_SOURCES = \
-	gdata-author.c		\
-	gdata-category.c	\
-	gdata-generator.c	\
-	gdata-link.c
-
-libgdataatom_la_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdata		\
-	-I$(top_srcdir)/gdata/atom	\
-	-DG_LOG_DOMAIN=\"libgdata-Atom\"\
-	$(DISABLE_DEPRECATED)		\
-	$(AM_CPPFLAGS)
-
-libgdataatom_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdataatom_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdataatom_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/exif/Makefile.am b/gdata/exif/Makefile.am
deleted file mode 100644
index 84b89249..00000000
--- a/gdata/exif/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-# Library
-gdataexifincludedir = $(pkgincludedir)/gdata/exif
-gdataexifinclude_HEADERS = gdata-exif-tags.h
-
-noinst_LTLIBRARIES = libgdataexif.la
-
-libgdataexif_la_SOURCES = gdata-exif-tags.c
-
-libgdataexif_la_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdata		\
-	-I$(top_srcdir)/gdata/exif	\
-	-DG_LOG_DOMAIN=\"libgdata-EXIF\"\
-	$(DISABLE_DEPRECATED)		\
-	$(AM_CPPFLAGS)
-
-libgdataexif_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdataexif_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdataexif_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/gd/Makefile.am b/gdata/gd/Makefile.am
deleted file mode 100644
index eef3d746..00000000
--- a/gdata/gd/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-gdatagdincludedir = $(pkgincludedir)/gdata/gd
-gdatagdinclude_HEADERS = \
-	gdata-gd-email-address.h	\
-	gdata-gd-im-address.h		\
-	gdata-gd-organization.h		\
-	gdata-gd-phone-number.h		\
-	gdata-gd-postal-address.h	\
-	gdata-gd-reminder.h		\
-	gdata-gd-when.h			\
-	gdata-gd-where.h		\
-	gdata-gd-who.h			\
-	gdata-gd-name.h
-
-noinst_LTLIBRARIES = libgdatagd.la
-
-libgdatagd_la_SOURCES = \
-	gdata-gd-email-address.c	\
-	gdata-gd-im-address.c		\
-	gdata-gd-organization.c		\
-	gdata-gd-phone-number.c		\
-	gdata-gd-postal-address.c	\
-	gdata-gd-reminder.c		\
-	gdata-gd-when.c			\
-	gdata-gd-where.c		\
-	gdata-gd-who.c			\
-	gdata-gd-name.c
-
-libgdatagd_la_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdata			\
-	-I$(top_srcdir)/gdata/gd		\
-	-DG_LOG_DOMAIN=\"libgdata-GData\"	\
-	$(DISABLE_DEPRECATED)			\
-	$(AM_CPPFLAGS)
-
-libgdatagd_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatagd_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatagd_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/georss/Makefile.am b/gdata/georss/Makefile.am
deleted file mode 100644
index 6a0a60f2..00000000
--- a/gdata/georss/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-# Library
-gdatageorssincludedir = $(pkgincludedir)/gdata/georss
-gdatageorssinclude_HEADERS = gdata-georss-where.h
-
-noinst_LTLIBRARIES = libgdatageorss.la
-
-libgdatageorss_la_SOURCES = gdata-georss-where.c
-
-libgdatageorss_la_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdata			\
-	-I$(top_srcdir)/gdata/georss		\
-	-DG_LOG_DOMAIN=\"libgdata-GeoRSS\"	\
-	$(DISABLE_DEPRECATED)			\
-	$(AM_CPPFLAGS)
-
-libgdatageorss_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatageorss_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatageorss_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/media/Makefile.am b/gdata/media/Makefile.am
deleted file mode 100644
index 3828d08f..00000000
--- a/gdata/media/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-# Enums
-GDATA_MEDIA_ENUM_FILES = \
-	gdata-media-enums.c	\
-	gdata-media-enums.h
-
-gdata-media-enums.h: $(gdata_media_headers) Makefile
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef GDATA_MEDIA_ENUMS_H\n#define GDATA_MEDIA_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* !GDATA_MEDIA_ENUMS_H */" $(gdata_media_headers)) > gdata-media-enums.h.tmp \
-	&& sed "s/g_data/gdata/" gdata-media-enums.h.tmp > gdata-media-enums.h.tmp2 \
-	&& sed "s/GDATA_TYPE_DATA/GDATA_TYPE/" gdata-media-enums.h.tmp2 > gdata-media-enums.h \
-	&& rm -f gdata-media-enums.h.tmp \
-	&& rm -f gdata-media-enums.h.tmp2
-
-gdata-media-enums.c: $(gdata_media_headers) Makefile gdata-media-enums.h
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#include \"gdata-media-content.h\"\n#include \"gdata-media-enums.h\"" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(gdata_media_headers)) > gdata-media-enums.c.tmp \
-	&& sed "s/g_data/gdata/" gdata-media-enums.c.tmp > gdata-media-enums.c \
-	&& rm -f gdata-media-enums.c.tmp
-
-# Library
-gdata_media_headers = \
-	gdata-media-category.h	\
-	gdata-media-content.h	\
-	gdata-media-credit.h	\
-	gdata-media-thumbnail.h
-
-gdatamediaincludedir = $(pkgincludedir)/gdata/media
-gdatamediainclude_HEADERS = \
-	$(gdata_media_headers)	\
-	gdata-media-enums.h
-
-noinst_LTLIBRARIES = libgdatamedia.la
-
-libgdatamedia_la_SOURCES = \
-	gdata-media-enums.c	\
-	gdata-media-category.c	\
-	gdata-media-content.c	\
-	gdata-media-credit.c	\
-	gdata-media-thumbnail.c	\
-	gdata-media-group.c	\
-	gdata-media-group.h
-
-libgdatamedia_la_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdata			\
-	-I$(top_srcdir)/gdata/media		\
-	-DG_LOG_DOMAIN=\"libgdata-MediaRSS\"	\
-	$(DISABLE_DEPRECATED)			\
-	$(AM_CPPFLAGS)
-
-libgdatamedia_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatamedia_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatamedia_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
-# General cleanup
-CLEANFILES = $(GDATA_MEDIA_ENUM_FILES)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/services/Makefile.am b/gdata/services/Makefile.am
deleted file mode 100644
index 039829df..00000000
--- a/gdata/services/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = youtube calendar contacts picasaweb documents
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/services/calendar/Makefile.am b/gdata/services/calendar/Makefile.am
deleted file mode 100644
index f116ec2f..00000000
--- a/gdata/services/calendar/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-gdatacalendarincludedir = $(pkgincludedir)/gdata/services/calendar
-gdatacalendarinclude_HEADERS = \
-	gdata-calendar-service.h	\
-	gdata-calendar-calendar.h	\
-	gdata-calendar-event.h		\
-	gdata-calendar-query.h		\
-	gdata-calendar-feed.h
-
-noinst_LTLIBRARIES = libgdatacalendar.la
-
-libgdatacalendar_headers =
-
-libgdatacalendar_la_SOURCES = \
-	gdata-calendar-service.c	\
-	gdata-calendar-service.h	\
-	gdata-calendar-calendar.c	\
-	gdata-calendar-calendar.h	\
-	gdata-calendar-event.c		\
-	gdata-calendar-event.h		\
-	gdata-calendar-query.c		\
-	gdata-calendar-query.h		\
-	gdata-calendar-feed.c		\
-	gdata-calendar-feed.h
-
-libgdatacalendar_la_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdata			\
-	-I$(top_srcdir)/gdata/services/calendar	\
-	-DG_LOG_DOMAIN=\"libgdata-Calendar\"	\
-	$(DISABLE_DEPRECATED)			\
-	$(AM_CPPFLAGS)
-
-libgdatacalendar_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatacalendar_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatacalendar_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/services/contacts/Makefile.am b/gdata/services/contacts/Makefile.am
deleted file mode 100644
index 337f5e27..00000000
--- a/gdata/services/contacts/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-gdatacontactsincludedir = $(pkgincludedir)/gdata/services/contacts
-gdatacontactsinclude_HEADERS = \
-	gdata-contacts-service.h	\
-	gdata-contacts-contact.h	\
-	gdata-contacts-query.h
-
-noinst_LTLIBRARIES = libgdatacontacts.la
-
-libgdatacontacts_headers =
-
-libgdatacontacts_la_SOURCES = \
-	gdata-contacts-service.c	\
-	gdata-contacts-service.h	\
-	gdata-contacts-contact.c	\
-	gdata-contacts-contact.h	\
-	gdata-contacts-query.c		\
-	gdata-contacts-query.h
-
-libgdatacontacts_la_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdata			\
-	-I$(top_srcdir)/gdata/services/contacts	\
-	-DG_LOG_DOMAIN=\"libgdata-Contacts\"	\
-	$(DISABLE_DEPRECATED)			\
-	$(AM_CPPFLAGS)
-
-libgdatacontacts_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatacontacts_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatacontacts_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/services/documents/Makefile.am b/gdata/services/documents/Makefile.am
deleted file mode 100644
index 0b69549f..00000000
--- a/gdata/services/documents/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-# Enums
-GDATA_DOCUMENTS_ENUM_FILES = \
-	gdata-documents-enums.c	\
-	gdata-documents-enums.h
-
-gdata-documents-enums.h: $(gdata_documents_headers) Makefile
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef GDATA_DOCUMENTS_ENUMS_H\n#define GDATA_DOCUMENTS_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* !GDATA_DOCUMENTS_ENUMS_H */" $(gdata_documents_headers)) > gdata-documents-enums.h.tmp \
-	&& sed "s/g_data/gdata/" gdata-documents-enums.h.tmp > gdata-documents-enums.h \
-	&& rm -f gdata-documents-enums.h.tmp
-
-gdata-documents-enums.c: $(gdata_documents_headers) Makefile gdata-documents-enums.h
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#include \"gdata-documents-service.h\"\n#include \"gdata-documents-text.h\"\n#include \"gdata-documents-spreadsheet.h\"\n#include \"gdata-documents-presentation.h\"\n#include \"gdata-documents-enums.h\"" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(gdata_documents_headers)) > gdata-documents-enums.c.tmp \
-	&& sed "s/g_data/gdata/" gdata-documents-enums.c.tmp > gdata-documents-enums.c \
-	&& rm -f gdata-documents-enums.c.tmp
-
-# Documents library
-gdatadocumentsincludedir = $(pkgincludedir)/gdata/services/documents
-
-gdata_documents_headers = \
-	gdata-documents-service.h	\
-	gdata-documents-feed.h		\
-	gdata-documents-entry.h		\
-	gdata-documents-query.h		\
-	gdata-documents-text.h		\
-	gdata-documents-presentation.h	\
-	gdata-documents-folder.h	\
-	gdata-documents-spreadsheet.h
-
-gdatadocumentsinclude_HEADERS = \
-	$(gdata_documents_headers)	\
-	gdata-documents-enums.h
-
-noinst_LTLIBRARIES = libgdatadocuments.la
-
-libgdatadocuments_la_SOURCES = \
-	$(GDATA_DOCUMENTS_ENUM_FILES)	\
-	gdata-documents-service.c	\
-	gdata-documents-feed.c		\
-	gdata-documents-entry.c		\
-	gdata-documents-text.c		\
-	gdata-documents-presentation.c	\
-	gdata-documents-spreadsheet.c	\
-	gdata-documents-folder.c	\
-	gdata-documents-query.c
-
-libgdatadocuments_la_CPPFLAGS = \
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/gdata				\
-	-I$(top_srcdir)/gdata/services/documents	\
-	-DG_LOG_DOMAIN=\"libgdata-Documents\"		\
-	$(DISABLE_DEPRECATED)				\
-	$(AM_CPPFLAGS)
-
-libgdatadocuments_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatadocuments_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatadocuments_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
-# General cleanup
-CLEANFILES = \
-	$(GDATA_DOCUMENTS_ENUM_FILES)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/services/picasaweb/Makefile.am b/gdata/services/picasaweb/Makefile.am
deleted file mode 100644
index 1734bbfe..00000000
--- a/gdata/services/picasaweb/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-# Enums
-GDATA_PICASAWEB_ENUM_FILES = \
-	gdata-picasaweb-enums.c	\
-	gdata-picasaweb-enums.h
-
-gdata-picasaweb-enums.h: $(gdata_picasaweb_headers) Makefile
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef GDATA_PICASAWEB_ENUMS_H\n#define GDATA_PICASAWEB_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* !GDATA_PICASAWEB_ENUMS_H */" $(gdata_picasaweb_headers)) > gdata-picasaweb-enums.h.tmp \
-	&& sed "s/g_data_picasa_web/gdata_picasaweb/" gdata-picasaweb-enums.h.tmp > gdata-picasaweb-enums.h.tmp2 \
-	&& sed "s/GDATA_TYPE_DATA_PICASA_WEB/GDATA_TYPE_PICASAWEB/" gdata-picasaweb-enums.h.tmp2 > gdata-picasaweb-enums.h \
-	&& rm -f gdata-picasaweb-enums.h.tmp \
-	&& rm -f gdata-picasaweb-enums.h.tmp2
-
-gdata-picasaweb-enums.c: $(gdata_picasaweb_headers) Makefile gdata-picasaweb-enums.h
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#include \"gdata-picasaweb-album.h\"\n#include \"gdata-picasaweb-enums.h\"" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(gdata_picasaweb_headers)) > gdata-picasaweb-enums.c.tmp \
-	&& sed "s/g_data_picasa_web/gdata_picasaweb/" gdata-picasaweb-enums.c.tmp > gdata-picasaweb-enums.c \
-	&& rm -f gdata-picasaweb-enums.c.tmp
-
-# Library
-gdatapicasawebincludedir = $(pkgincludedir)/gdata/services/picasaweb
-
-gdata_picasaweb_headers = \
-	gdata-picasaweb-service.h	\
-	gdata-picasaweb-query.h		\
-	gdata-picasaweb-file.h		\
-	gdata-picasaweb-album.h    	\
-	gdata-picasaweb-user.h		\
-	gdata-picasaweb-feed.h
-
-gdatapicasawebinclude_HEADERS = \
-	$(gdata_picasaweb_headers)	\
-	gdata-picasaweb-enums.h
-
-noinst_LTLIBRARIES = libgdatapicasaweb.la
-
-libgdatapicasaweb_la_SOURCES = \
-	gdata-picasaweb-enums.c		\
-	gdata-picasaweb-album.c		\
-	gdata-picasaweb-query.c		\
-	gdata-picasaweb-file.c		\
-	gdata-picasaweb-service.c	\
-	gdata-picasaweb-user.c		\
-	gdata-picasaweb-feed.c
-
-libgdatapicasaweb_la_CPPFLAGS = \
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/gdata				\
-	-I$(top_srcdir)/gdata/services/picasaweb	\
-	-DG_LOG_DOMAIN=\"libgdata-PicasaWeb\"		\
-	$(DISABLE_DEPRECATED)				\
-	$(AM_CPPFLAGS)
-
-libgdatapicasaweb_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatapicasaweb_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatapicasaweb_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
-# General cleanup
-CLEANFILES = $(GDATA_PICASAWEB_ENUM_FILES)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/services/youtube/Makefile.am b/gdata/services/youtube/Makefile.am
deleted file mode 100644
index 5bc36a63..00000000
--- a/gdata/services/youtube/Makefile.am
+++ /dev/null
@@ -1,82 +0,0 @@
-# Enums
-GDATA_YOUTUBE_ENUM_FILES = \
-	gdata-youtube-enums.c	\
-	gdata-youtube-enums.h
-
-gdata-youtube-enums.h: $(gdata_youtube_headers) Makefile
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#ifndef GDATA_YOUTUBE_ENUMS_H\n#define GDATA_YOUTUBE_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-			--fprod "/* enumerations from \"@filename@\" */\n" \
-			--vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDATA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
-			--ftail "G_END_DECLS\n\n#endif /* !GDATA_YOUTUBE_ENUMS_H */" $(gdata_youtube_headers)) > gdata-youtube-enums.h.tmp \
-	&& sed "s/g_data_you_tube/gdata_youtube/" gdata-youtube-enums.h.tmp > gdata-youtube-enums.h.tmp2 \
-	&& sed "s/GDATA_TYPE_DATA_YOU_TUBE/GDATA_TYPE_YOUTUBE/" gdata-youtube-enums.h.tmp2 > gdata-youtube-enums.h \
-	&& rm -f gdata-youtube-enums.h.tmp \
-	&& rm -f gdata-youtube-enums.h.tmp2
-
-gdata-youtube-enums.c: $(gdata_youtube_headers) Makefile gdata-youtube-enums.h
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) \
-			--fhead "#include \"gdata-youtube-service.h\"\n#include \"gdata-youtube-query.h\"\n#include \"gdata-youtube-enums.h\"" \
-			--fprod "\n/* enumerations from \"@filename@\" */" \
-			--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {" \
-			--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-			--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		$(gdata_youtube_headers)) > gdata-youtube-enums.c.tmp \
-	&& sed "s/g_data_you_tube/gdata_youtube/" gdata-youtube-enums.c.tmp > gdata-youtube-enums.c \
-	&& rm -f gdata-youtube-enums.c.tmp
-
-# Library
-gdatayoutubeincludedir = $(pkgincludedir)/gdata/services/youtube
-
-gdata_youtube_headers = \
-	gdata-youtube-service.h		\
-	gdata-youtube-video.h		\
-	gdata-youtube-content.h		\
-	gdata-youtube-credit.h		\
-	gdata-youtube-query.h		\
-	gdata-youtube-state.h
-
-gdatayoutubeinclude_HEADERS = \
-	$(gdata_youtube_headers)	\
-	gdata-youtube-enums.h
-
-noinst_LTLIBRARIES = libgdatayoutube.la
-
-libgdatayoutube_la_SOURCES = \
-	gdata-youtube-enums.c		\
-	gdata-youtube-service.c		\
-	gdata-youtube-video.c		\
-	gdata-youtube-content.c		\
-	gdata-youtube-credit.c		\
-	gdata-youtube-query.c		\
-	gdata-youtube-group.c		\
-	gdata-youtube-group.h		\
-	gdata-youtube-state.c		\
-	gdata-youtube-control.c		\
-	gdata-youtube-control.h
-
-libgdatayoutube_la_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdata			\
-	-I$(top_srcdir)/gdata/services/youtube	\
-	-DG_LOG_DOMAIN=\"libgdata-YouTube\"	\
-	$(DISABLE_DEPRECATED)			\
-	$(AM_CPPFLAGS)
-
-libgdatayoutube_la_CFLAGS = \
-	$(GDATA_CFLAGS)	\
-	$(WARN_CFLAGS)	\
-	$(AM_CFLAGS)	\
-	-D_GNU_SOURCE
-
-libgdatayoutube_la_LIBADD = \
-	$(GDATA_LIBS)
-
-libgdatayoutube_la_LDFLAGS = \
-	-no-undefined	\
-	$(AM_LDFLAGS)
-
-# General cleanup
-CLEANFILES = $(GDATA_YOUTUBE_ENUM_FILES)
-
--include $(top_srcdir)/git.mk
diff --git a/gdata/tests/Makefile.am b/gdata/tests/Makefile.am
index 2ef90481..06882888 100644
--- a/gdata/tests/Makefile.am
+++ b/gdata/tests/Makefile.am
@@ -1,9 +1,9 @@
-include $(top_srcdir)/Makefile.decl
+include $(top_srcdir)/gtester.mk
 
 INCLUDES = \
 	-I$(top_srcdir)/				\
 	-I$(top_srcdir)/gdata				\
-	$(GDK_CFLAGS)  					\
+	$(GDK_CFLAGS)					\
 	-DTEST_FILE_DIR="\"$(top_srcdir)/gdata/tests/\""\
 	$(DISABLE_DEPRECATED)				\
 	$(WARN_CFLAGS)					\
diff --git a/gdata/tests/documents.c b/gdata/tests/documents.c
index 3e72cbd9..7436b90c 100644
--- a/gdata/tests/documents.c
+++ b/gdata/tests/documents.c
@@ -628,7 +628,7 @@ main (int argc, char *argv[])
 
 	g_test_add_data_func ("/documents/move/remove_from_folder", service, test_add_remove_file_from_folder);
 
-	g_test_add_data_func ("/documents/remove/all", service, test_remove_all_documents_and_folders);
+	/*g_test_add_data_func ("/documents/remove/all", service, test_remove_all_documents_and_folders);*/
 
 	retval = g_test_run ();
 
diff --git a/Makefile.decl b/gtester.mk
index 4d83c042..13061933 100644
--- a/Makefile.decl
+++ b/gtester.mk
@@ -1,10 +1,15 @@
-GTESTER        = gtester		# in $PATH for non-GLIB packages
-GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
+# GLIB - Library of useful C routines
+# From http://git.gnome.org/browse/glib/tree/Makefile.decl
+
+GTESTER = gtester
+GTESTER_REPORT = gtester-report
 
 # initialize variables for unconditional += appending
 EXTRA_DIST =
 TEST_PROGS =
 
+### testing rules
+
 # test: run all tests in cwd and subdirs
 test:	${TEST_PROGS}
 	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
@@ -52,3 +57,4 @@ test-report perf-report full-report:	${TEST_PROGS}
 .PHONY: test test-report perf-report full-report
 # run make test as part of make check
 check-local: test
+
diff --git a/introspection.m4 b/introspection.m4
index f9ce49ce..589721c5 100644
--- a/introspection.m4
+++ b/introspection.m4
@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
     fi
     AC_SUBST(INTROSPECTION_SCANNER)
     AC_SUBST(INTROSPECTION_COMPILER)
     AC_SUBST(INTROSPECTION_GENERATE)
     AC_SUBST(INTROSPECTION_GIRDIR)
     AC_SUBST(INTROSPECTION_TYPELIBDIR)
+    AC_SUBST(INTROSPECTION_CFLAGS)
+    AC_SUBST(INTROSPECTION_LIBS)
+    AC_SUBST(INTROSPECTION_MAKEFILE)
 
     AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 ])