[gegl] distcheck: sprinkle $(srcdir) over Makefiles with wild abandon
- From: Nils Philippsen <nphilipp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] distcheck: sprinkle $(srcdir) over Makefiles with wild abandon
- Date: Mon, 26 Nov 2012 16:03:42 +0000 (UTC)
commit deff0495de1c9342b60aa05af6fb7e539f81b1fb
Author: Nils Philippsen <nils redhat com>
Date: Mon Nov 26 17:01:48 2012 +0100
distcheck: sprinkle $(srcdir) over Makefiles with wild abandon
examples/Makefile.am | 2 +-
examples/data/Makefile.am | 2 +-
operations/generated/Makefile.am | 2 +-
operations/workshop/generated/Makefile.am | 2 +-
tests/buffer/reference/Makefile.am | 2 +-
tests/buffer/tests/Makefile.am | 2 +-
tests/compositions/Makefile.am | 4 ++--
tests/compositions/data/Makefile.am | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/examples/Makefile.am b/examples/Makefile.am
index c29a1dd..10aa298 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -3,7 +3,7 @@
SUBDIRS = data
CFILES = $(wildcard $(srcdir)/*.c)
bins = $(subst $(srcdir)/,,$(CFILES:.c=))
-EXTRA_DIST = $(wildcard *.c) $(wildcard util/*.[ch])
+EXTRA_DIST = $(wildcard $(srcdir)/*.c) $(wildcard $(srcdir)/util/*.[ch])
gegl_lt_cc_v = $(gegl_lt_cc_v_$(V))
gegl_lt_cc_v_ = $(gegl_lt_cc_v_$(AM_DEFAULT_VERBOSITY))
diff --git a/examples/data/Makefile.am b/examples/data/Makefile.am
index 0f68210..795a5f1 100644
--- a/examples/data/Makefile.am
+++ b/examples/data/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST=$(wildcard *.png) $(wildcard *.jpg)
+EXTRA_DIST=$(wildcard $(srcdir)/*.png) $(wildcard $(srcdir)/*.jpg)
diff --git a/operations/generated/Makefile.am b/operations/generated/Makefile.am
index 956b57e..83dd047 100644
--- a/operations/generated/Makefile.am
+++ b/operations/generated/Makefile.am
@@ -3,4 +3,4 @@ include $(top_srcdir)/operations/Makefile-operations.am
AM_CPPFLAGS += \
-I$(top_srcdir)/operations/generated
-EXTRA_DIST += $(wildcard *.rb) $(wildcard *.c)
+EXTRA_DIST += $(wildcard $(srcdir)/*.rb) $(wildcard $(srcdir)/*.c)
diff --git a/operations/workshop/generated/Makefile.am b/operations/workshop/generated/Makefile.am
index 075de5d..76aef18 100644
--- a/operations/workshop/generated/Makefile.am
+++ b/operations/workshop/generated/Makefile.am
@@ -2,4 +2,4 @@ include $(top_srcdir)/operations/Makefile-operations.am
AM_CPPFLAGS += -I$(top_srcdir)/operations/workshop/generated
-EXTRA_DIST += $(wildcard *.rb) $(wildcard *.c)
+EXTRA_DIST += $(wildcard $(srcdir)/*.rb) $(wildcard $(srcdir)/*.c)
diff --git a/tests/buffer/reference/Makefile.am b/tests/buffer/reference/Makefile.am
index daa6096..86900cc 100644
--- a/tests/buffer/reference/Makefile.am
+++ b/tests/buffer/reference/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = $(wildcard *.buf)
+EXTRA_DIST = $(wildcard $(srcdir)/*.buf)
diff --git a/tests/buffer/tests/Makefile.am b/tests/buffer/tests/Makefile.am
index f403d78..3f1d732 100644
--- a/tests/buffer/tests/Makefile.am
+++ b/tests/buffer/tests/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = $(wildcard *.c)
+EXTRA_DIST = $(wildcard $(srcdir)/*.c)
diff --git a/tests/compositions/Makefile.am b/tests/compositions/Makefile.am
index 2d46346..f6d6428 100644
--- a/tests/compositions/Makefile.am
+++ b/tests/compositions/Makefile.am
@@ -10,7 +10,7 @@
SUBDIRS=data
-EXTRA_DIST=$(wildcard *.xml) $(wildcard reference/*)
+EXTRA_DIST=$(wildcard $(srcdir)/*.xml) $(wildcard $(srcdir)/reference/*)
# Env vars to make binaries use builddir stuff
builddir_gegl_env = GEGL_SWAP=RAM GEGL_PATH=$(top_builddir)/operations
@@ -27,7 +27,7 @@ builddir_img_cmp = $(builddir_gegl_env) $(img_cmp_bin)
testprefix = run-
testsuffix = .sh
-# List of tests. The .sh suffix allows us to use $(wildcard *.xml) in
+# List of tests. The .sh suffix allows us to use $(wildcard $(srcdir)/*.xml) in
# EXTRA_DISTS
TESTS = \
run-clones.xml.sh \
diff --git a/tests/compositions/data/Makefile.am b/tests/compositions/data/Makefile.am
index 12ffa1b..2a1bbf9 100644
--- a/tests/compositions/data/Makefile.am
+++ b/tests/compositions/data/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST=$(wildcard *.png) $(wildcard *.jpg) $(wildcard *.jp2) $(wildcard *.hdr)
+EXTRA_DIST=$(wildcard $(srcdir)/*.png) $(wildcard $(srcdir)/*.jpg) $(wildcard $(srcdir)/*.jp2) $(wildcard $(srcdir)/*.hdr)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]