GNOME.org
 

[gobject-introspection] Revert "removing $(srcdir) because it is not replaced correctly and not necessary"

commit 2d7cb109011b694904653eb6969049be36011cf8
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Thu May 4 23:12:45 2017 +0100

    Revert "removing $(srcdir) because it is not replaced correctly and not necessary"
    
    This reverts commit 17ef691e9b3ebd475b01d1e623d3df7b1f534dfa.
    
    This breaks builddir != srcdir builds, like GNOME Continuous.

 docs/reference/Makefile.am   |    2 +-
 tests/Makefile.am            |    2 +-
 tests/offsets/Makefile.am    |    4 ++--
 tests/repository/Makefile.am |    8 ++++----
 tests/scanner/Makefile.am    |   24 ++++++++++++------------
 tests/warn/Makefile.am       |    2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 994b114..332bd70 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -60,7 +60,7 @@ IGNORE_HFILES=                                                \
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
 HTML_IMAGES=                                           \
-    images/overview.png
+    $(srcdir)/images/overview.png
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 45a768d..bdd0fa7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -68,7 +68,7 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
        --add-include-path=$(top_builddir) --include=Gio-2.0 \
        --library=libgimarshallingtests-1.0.la  --output=$@ \
        --c-include="tests/gimarshallingtests.h" \
-       gimarshallingtests.h gimarshallingtests.c
+       $(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c
 
 %.typelib: %.gir
        $(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index 0130ee5..a40e90b 100644
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -24,7 +24,7 @@ Offsets-1.0.gir: liboffsets.la offsets.h
 Offsets_1_0_gir_INCLUDES = GObject-2.0
 Offsets_1_0_gir_LIBS = liboffsets.la
 Offsets_1_0_gir_PACKAGES = gobject-2.0
-Offsets_1_0_gir_FILES = offsets.h offsets.c
+Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c
 Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error  -I$(top_srcdir)/tests
 INTROSPECTION_GIRS += Offsets-1.0.gir
 
@@ -39,7 +39,7 @@ gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_s
 gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
 gitestoffsets.c: gen-gitestoffsets offsets.h Offsets-1.0.typelib
-       $(AM_V_GEN) $(PYTHON) gen-gitestoffsets offsets.h > $@ || ( rm -f $@ && false )
+       $(AM_V_GEN) $(PYTHON) $(srcdir)/gen-gitestoffsets $(srcdir)/offsets.h > $@ || ( rm -f $@ && false )
 
 EXTRA_DIST += gen-gitestoffsets
 BUILT_SOURCES += gitestoffsets.c
diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
index 6b4b782..d1cbaa5 100644
--- a/tests/repository/Makefile.am
+++ b/tests/repository/Makefile.am
@@ -5,19 +5,19 @@ LIBS = $(GOBJECT_LIBS)
 EXTRA_PROGRAMS = gitestrepo giteststructinfo gitestthrows gitypelibtest
 CLEANFILES = $(EXTRA_PROGRAMS)
 
-gitestrepo_SOURCES = gitestrepo.c
+gitestrepo_SOURCES = $(srcdir)/gitestrepo.c
 gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitestrepo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
-giteststructinfo_SOURCES = giteststructinfo.c
+giteststructinfo_SOURCES = $(srcdir)/giteststructinfo.c
 giteststructinfo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 giteststructinfo_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
-gitestthrows_SOURCES = gitestthrows.c
+gitestthrows_SOURCES = $(srcdir)/gitestthrows.c
 gitestthrows_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitestthrows_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
-gitypelibtest_SOURCES = gitypelibtest.c
+gitypelibtest_SOURCES = $(srcdir)/gitypelibtest.c
 gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
 gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 6d5e0cf..13156c3 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -28,18 +28,18 @@ AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBI
 AM_LDFLAGS = -rpath /unused -avoid-version
 LIBS = $(GOBJECT_LIBS) $(GTHREAD_LIBS)
 
-libsletter_la_SOURCES = sletter.c sletter.h
+libsletter_la_SOURCES = $(srcdir)/sletter.c $(srcdir)/sletter.h
 libsletter_la_LIBADD = $(GIO_LIBS)
 libsletter_la_CFLAGS = $(AM_CFLAGS)
 libsletter_la_LDFLAGS = $(AM_LDFLAGS)
 
-libutility_la_SOURCES = utility.c utility.h
-libgtkfrob_la_SOURCES = gtkfrob.c gtkfrob.h
+libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h
+libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h
 libregress_la_SOURCES = \
-       regress.c regress.h \
-       annotation.c annotation.h \
-       foo.c foo.h \
-       drawable.c drawable.h \
+       $(srcdir)/regress.c $(srcdir)/regress.h \
+       $(srcdir)/annotation.c $(srcdir)/annotation.h \
+       $(srcdir)/foo.c $(srcdir)/foo.h \
+       $(srcdir)/drawable.c $(srcdir)/drawable.h \
        $(NULL)
 REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" \
@@ -49,11 +49,11 @@ if HAVE_CAIRO
 libregress_la_LIBADD += $(CAIRO_LIBS)
 endif
 libwarnlib_la_CFLAGS = $(AM_CFLAGS)
-libwarnlib_la_SOURCES = warnlib.c warnlib.h
+libwarnlib_la_SOURCES = $(srcdir)/warnlib.c $(srcdir)/warnlib.h
 libwarnlib_la_LIBADD = $(GIO_LIBS)
 libwarnlib_la_LDFLAGS = -export-symbols-regex '^warnlib_' -no-undefined
-libgettype_la_SOURCES = gettype.c gettype.h
-libtypedefs_la_SOURCES = typedefs.c typedefs.h
+libgettype_la_SOURCES = $(srcdir)/gettype.c $(srcdir)/gettype.h
+libtypedefs_la_SOURCES = $(srcdir)/typedefs.c $(srcdir)/typedefs.h
 
 testsdir = $(datadir)/gobject-introspection-1.0/tests
 tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) $(libutility_la_SOURCES)
@@ -151,7 +151,7 @@ if !OS_WIN32
 EXTRA_PROGRAMS = barapp
 CLEANFILES += $(EXTRA_PROGRAMS)
 
-barapp_SOURCES = barapp.c barapp.h
+barapp_SOURCES = $(srcdir)/barapp.c $(srcdir)/barapp.h
 barapp_LDADD = $(top_builddir)/libgirepository-1.0.la
 barapp_LDFLAGS = -export-dynamic
 
@@ -184,7 +184,7 @@ CHECKGIRS += Identfilter-1.0.gir
 Identfilter-1.0.gir: identfilter.h
        $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \
                --namespace=Identfilter --accept-unprefixed --nsversion=1.0 --header-only \
-               --identifier-filter-cmd="$(PYTHON) identfilter.py" \
+               --identifier-filter-cmd="$(PYTHON) $(srcdir)/identfilter.py" \
                --output=$@ $<
 
 EXTRA_DIST += \
diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am
index f630784..5f47df0 100644
--- a/tests/warn/Makefile.am
+++ b/tests/warn/Makefile.am
@@ -22,6 +22,6 @@ TESTS = \
        unresolved-type.h
 
 LOG_COMPILER = env PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) 
UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
-       $(PYTHON) warningtester.py
+       $(PYTHON) $(srcdir)/warningtester.py
 
 EXTRA_DIST = warningtester.py common.h $(TESTS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]