Merge remote branch 'pwith/build-cleanup'

Performed quite a modifications to this branch, as it wasn't rebased on top of
the latest build changes (which also made "make distclean" work for the first
time).

Conflicts:
	backends/telepathy/Makefile.am
	configure.ac

diff --cc backends/telepathy/Makefile.am
index 0a8b9b4,79761f9..e877691
--- 1/backends/telepathy/Makefile.am
--- 2/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@@ -51,21 -39,15 +39,22 @@@ libtp_lowlevel_la_LDFLAGS = 
        $(NULL)
  
  tp-lowlevel.gi: $(libtp-lowlevel_la_SOURCES) libtp-lowlevel.la
-       $(VGI_V)$(VALA_GEN_INTROSPECT) --namespace=Folks \
 -      $(AM_V_GEN)$(VALA_GEN_INTROSPECT) --namespace=Folks tp-lowlevel.h \
++      $(AM_V_GEN)$(VALA_GEN_INTROSPECT) --namespace=Folks \
 +              $(srcdir)/tp-lowlevel.h \
                $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) $(GEE_CFLAGS) \
                $(TP_VALA_CFLAGS) $(TP_GLIB_CFLAGS) -I$(top_srcdir)/folks \
                .libs/libtp-lowlevel.so > tp-lowlevel.gi
  
 +# copy the metadata file as necessary, to work around gnome bug #624278
  tp-lowlevel.vapi: tp-lowlevel.gi tp-lowlevel.metadata
-       $(VAPIGEN_V)$(VAPIGEN) $(VALAFLAGS) --library tp-lowlevel \
-               --metadata=tp-lowlevel.metadata \
 +      test -e tp-lowlevel.metadata || \
 +              (cp $(srcdir)/tp-lowlevel.metadata . && \
 +              touch tp-lowlevel.metadata.copied)
 -              --metadata=tp-lowlevel.metadata --pkg telepathy-glib \
+       $(AM_V_GEN)$(VAPIGEN) $(TP_VALA_VALAFLAGS) --library tp-lowlevel \
++              --metadata=tp-lowlevel.metadata --pkg gio-2.0 \
++              --pkg telepathy-glib \
                tp-lowlevel.gi
 +      test ! -e tp-lowlevel.metadata.copied || rm -f tp-lowlevel.metadata*
  
  internal_vapi_files = \
        tp-lowlevel.vapi \
@@@ -130,8 -112,8 +119,8 @@@ folks_telepathy_vapi_deps = 
  folks-telepathy.vapi folks-telepathy.vala.stamp: $(folks_telepathy_vapi_deps)
        $(VALA_V)$(VALAC) $(VALACFLAGS) $(VALAFLAGS) -H folks-telepathy.h -C \
                --library folks-telepathy \
-               --pkg tp-lowlevel \
-               $(tp_sources_with_path)
+               $(addprefix --pkg ,$(folks_telepathy_deps)) \
 -              $(folks_telepathy_valasources)
++              $(addprefix $(srcdir)/,$(folks_telepathy_valasources))
        touch $@
  
  ##################################################################
@@@ -143,13 -125,14 +132,17 @@@ folks_backend_telepathy_valasources = 
        tp-backend-factory.vala \
        $(NULL)
  
- backend_tp_sources_with_path = \
-       $(foreach x,$(libfolks_backend_telepathy_la_VALASOURCES),$(srcdir)/$(x))
+ folks_backend_telepathy_deps = \
+       folks \
+       folks-telepathy \
++      gee-1.0 \
++      gio-2.0 \
+       gobject-2.0 \
+       telepathy-glib \
+       $(NULL)
  
 -libfolks_backend_telepathy_la_SOURCES = $(folks_backend_telepathy_valasources:.vala=.c)
 +libfolks_backend_telepathy_la_SOURCES = \
-       folks-backend-telepathy.vala.stamp \
-       $(libfolks_backend_telepathy_la_VALASOURCES:.vala=.c) \
-       $(NULL)
++      $(folks_backend_telepathy_valasources:.vala=.c)
  
  libfolks_backend_telepathy_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
@@@ -170,13 -153,7 +163,8 @@@ libfolks_backend_telepathy_la_LIBADD = 
  
  libfolks_backend_telepathy_la_LDFLAGS = -shared -fPIC -module -avoid-version
  
- folks_backend_telepathy_stamp_targets = \
-       folks-backend-telepathy.h \
-       $(libfolks_backend_telepathy_la_VALASOURCES:.vala=.c) \
-       $(libfolks_backend_telepathy_la_VALASOURCES:.vala=.h) \
-       $(NULL)
- 
- $(folks_backend_telepathy_stamp_targets): folks-backend-telepathy.vala.stamp
 -folks-backend-telepathy.h $(libfolks_backend_telepathy_la_SOURCES): folks-backend-telepathy.vala.stamp
++folks-backend-telepathy.h $(libfolks_backend_telepathy_la_SOURCES): \
++              folks-backend-telepathy.vala.stamp
  
  vapi_deps = \
        folks-telepathy.vapi \
@@@ -189,9 -166,8 +177,8 @@@ folks-backend-telepathy.vapi folks-back
        $(VALA_V)$(VALAC) $(VALACFLAGS) $(VALAFLAGS) \
                -H folks-backend-telepathy.h -C \
                --library folks-backend-telepathy \
-               --pkg folks \
-               --pkg folks-telepathy \
-               $(backend_tp_sources_with_path)
+               $(addprefix --pkg ,$(folks_backend_telepathy_deps)) \
 -              $(folks_backend_telepathy_valasources)
++              $(addprefix $(srcdir)/,$(folks_backend_telepathy_valasources))
        touch $@
  
  ##################################################################
@@@ -216,10 -192,6 +203,10 @@@ BUILT_SOURCES = 
  CLEANFILES = $(BUILT_SOURCES)
  
  EXTRA_DIST = \
-       $(libfolks_telepathy_la_VALASOURCES) \
-       $(libfolks_backend_telepathy_la_VALASOURCES) \
++      $(folks_telepathy_valasources) \
++      $(folks_backend_telepathy_valasources) \
 +      $(libtp_lowlevel_la_SOURCES) \
 +      tp-lowlevel.metadata \
        $(pkgconfig_in) \
        folks-telepathy.vala.stamp \
        folks-telepathy.vapi \

diff --cc configure.ac
index 16e7366,6c11d0a..23b67fe
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -39,23 -39,6 +39,22 @@@ AM_PROG_CC_C_
  AC_DISABLE_STATIC
  AC_PROG_LIBTOOL
  
- GTK_DOC_CHECK([1.10])
 +AC_SUBST(CFLAGS)
 +AC_SUBST(CPPFLAGS)
 +AC_SUBST(LDFLAGS)
 +
 +# -----------------------------------------------------------
 +# Dependencies
 +# -----------------------------------------------------------
 +GLIB_REQUIRED=2.24.0
 +TP_GLIB_REQUIRED=0.11.10
 +TP_VALA_REQUIRED=0.11.10
 +VALA_REQUIRED=0.9.2.120-5ad2f
 +
 +PKG_CHECK_MODULES(VALA, vala-1.0 >= $VALA_REQUIRED)
 +AC_SUBST(VALA_CFLAGS)
 +AC_SUBST(VALA_LIBS)
 +
  AC_PATH_PROG(VALAC, valac, valac)
  AC_SUBST(VALAC)
  

diff --cc docs/Makefile.am
index 55ea4b3,7c549ec..e1b8011
--- 1/docs/Makefile.am
--- 2/docs/Makefile.am
+++ b/docs/Makefile.am
@@@ -37,5 -37,8 +37,8 @@@ folks-0.1/index.html: $(doc_files
  
  distclean-local: distclean-docs
  distclean-docs:
--      cd $(srcdir) && rm -rf folks-0.1
++      rm -rf folks-0.1
  
+ GITIGNOREFILES = folks-0.1/
+ 
+ -include $(top_srcdir)/git.mk

diff --cc folks/Makefile.am
index 14c249d,dc5ac45..7cc9d0e
--- 1/folks/Makefile.am
--- 2/folks/Makefile.am
+++ b/folks/Makefile.am
@@@ -79,10 -72,7 +72,8 @@@ BUILT_SOURCES = 
        folks-uninstalled.pc \
        $(NULL)
  
- CLEANFILES = $(BUILT_SOURCES)
- 
  EXTRA_DIST = \
-       $(libfolks_la_VALASOURCES) \
++      $(folks_valasources) \
        $(pkgconfig_in) \
        build-conf.vapi \
        folks.vala.stamp \