[gom] build-sys: Don't use $(top_srcdir) to locate source files

[Bastien Nocera <hadess src gnome org>]

commit e57b4136c0487d8a60d39e598fb5051159b399e1
Author: Christophe Fergeau <cfergeau redhat com>
Date:   Tue Feb 17 16:29:18 2015 +0100

    build-sys: Don't use $(top_srcdir) to locate source files
    
    This is implicit, and having a variable in source filenames causes
    issues when used with subdir-objects (see
    https://bugzilla.gnome.org/show_bug.cgi?id=740948#c5 and following
    comments).
    I've checked that make distcheck (ie builddir!=srcdir) is still
    successful after this change.

 gom/Makefile.include   |   40 ++++++++++++++++++++--------------------
 tests/Makefile.include |   18 +++++++++---------
 2 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/gom/Makefile.include b/gom/Makefile.include
index bfdfe9d..fac0697 100644
--- a/gom/Makefile.include
+++ b/gom/Makefile.include
@@ -5,31 +5,31 @@ lib_LTLIBRARIES =
 lib_LTLIBRARIES += libgom-1.0.la
 
 INST_H_FILES =
-INST_H_FILES += $(top_srcdir)/gom/gom.h
-INST_H_FILES += $(top_srcdir)/gom/gom-adapter.h
-INST_H_FILES += $(top_srcdir)/gom/gom-command-builder.h
-INST_H_FILES += $(top_srcdir)/gom/gom-command.h
-INST_H_FILES += $(top_srcdir)/gom/gom-cursor.h
-INST_H_FILES += $(top_srcdir)/gom/gom-error.h
-INST_H_FILES += $(top_srcdir)/gom/gom-filter.h
-INST_H_FILES += $(top_srcdir)/gom/gom-repository.h
-INST_H_FILES += $(top_srcdir)/gom/gom-resource-group.h
-INST_H_FILES += $(top_srcdir)/gom/gom-resource.h
+INST_H_FILES += gom/gom.h
+INST_H_FILES += gom/gom-adapter.h
+INST_H_FILES += gom/gom-command-builder.h
+INST_H_FILES += gom/gom-command.h
+INST_H_FILES += gom/gom-cursor.h
+INST_H_FILES += gom/gom-error.h
+INST_H_FILES += gom/gom-filter.h
+INST_H_FILES += gom/gom-repository.h
+INST_H_FILES += gom/gom-resource-group.h
+INST_H_FILES += gom/gom-resource.h
 
-NOINST_H_FILES = $(top_srcdir)/gom/gom-resource-priv.h
+NOINST_H_FILES = gom/gom-resource-priv.h
 
 libgom_1_0_la_SOURCES =
 libgom_1_0_la_SOURCES += $(INST_H_FILES)
 libgom_1_0_la_SOURCES += $(NOINST_H_FILES)
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-adapter.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-command-builder.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-command.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-cursor.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-error.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-filter.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-repository.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-resource.c
-libgom_1_0_la_SOURCES += $(top_srcdir)/gom/gom-resource-group.c
+libgom_1_0_la_SOURCES += gom/gom-adapter.c
+libgom_1_0_la_SOURCES += gom/gom-command-builder.c
+libgom_1_0_la_SOURCES += gom/gom-command.c
+libgom_1_0_la_SOURCES += gom/gom-cursor.c
+libgom_1_0_la_SOURCES += gom/gom-error.c
+libgom_1_0_la_SOURCES += gom/gom-filter.c
+libgom_1_0_la_SOURCES += gom/gom-repository.c
+libgom_1_0_la_SOURCES += gom/gom-resource.c
+libgom_1_0_la_SOURCES += gom/gom-resource-group.c
 
 libgom_1_0_la_CPPFLAGS =
 libgom_1_0_la_CPPFLAGS += '-DG_LOG_DOMAIN="Gom"'
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 735348c..5c888ff 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -19,39 +19,39 @@ TEST_PROGS += test-gom-migration
 TEST_PROGS += test-gom-constraints
 TEST_PROGS += test-gom-insert
 
-test_gom_adapter_SOURCES = $(top_srcdir)/tests/test-gom-adapter.c
+test_gom_adapter_SOURCES = tests/test-gom-adapter.c
 test_gom_adapter_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(WARN_CFLAGS)
 test_gom_adapter_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_repository_SOURCES = $(top_srcdir)/tests/test-gom-repository.c
+test_gom_repository_SOURCES = tests/test-gom-repository.c
 test_gom_repository_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(WARN_CFLAGS)
 test_gom_repository_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_find_SOURCES = $(top_srcdir)/tests/test-gom-find.c
+test_gom_find_SOURCES = tests/test-gom-find.c
 test_gom_find_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS)  $(WARN_CFLAGS) 
-DDB="\"$(top_srcdir)/tests/grl-bookmarks.db\""
 test_gom_find_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_migration_SOURCES = $(top_srcdir)/tests/test-gom-migration.c
+test_gom_migration_SOURCES = tests/test-gom-migration.c
 test_gom_migration_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS)  $(WARN_CFLAGS) 
-DDB="\"$(top_srcdir)/tests/grl-bookmarks.db\""
 test_gom_migration_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_transform_SOURCES = $(top_srcdir)/tests/test-gom-transform.c
+test_gom_transform_SOURCES = tests/test-gom-transform.c
 test_gom_transform_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(PIXBUF_CFLAGS) $(WARN_CFLAGS) 
-DIMAGE="\"$(top_srcdir)/tests/gnome.png\""
 test_gom_transform_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(PIXBUF_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_stress_SOURCES = $(top_srcdir)/tests/test-gom-stress.c
+test_gom_stress_SOURCES = tests/test-gom-stress.c
 test_gom_stress_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(WARN_CFLAGS) 
-DDB="\"$(top_srcdir)/tests/grl-bookmarks.db\""
 test_gom_stress_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_constraints_SOURCES = $(top_srcdir)/tests/test-gom-constraints.c
+test_gom_constraints_SOURCES = tests/test-gom-constraints.c
 test_gom_constraints_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(WARN_CFLAGS)
 test_gom_constraints_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_insert_SOURCES = $(top_srcdir)/tests/test-gom-insert.c
+test_gom_insert_SOURCES = tests/test-gom-insert.c
 test_gom_insert_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(WARN_CFLAGS)
 test_gom_insert_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la
 
-test_gom_find_specific_SOURCES = $(top_srcdir)/tests/test-gom-find-specific.c
+test_gom_find_specific_SOURCES = tests/test-gom-find-specific.c
 test_gom_find_specific_CPPFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(WARN_CFLAGS)
 test_gom_find_specific_LDADD = $(GIO_LIBS) $(GOBJECT_LIBS) $(top_builddir)/libgom-1.0.la