[aravis] build: Makefile.decl and gtk-doc.make both try to define EXTRA_DIST
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [aravis] build: Makefile.decl and gtk-doc.make both try to define EXTRA_DIST
- Date: Wed, 26 May 2010 13:05:52 +0000 (UTC)
commit dd05cfab9d11843b0fd08ce40ffb212f8340ecc7
Author: Emmanuel Pacaud <emmanuel gnome org>
Date: Wed May 26 15:04:18 2010 +0200
build: Makefile.decl and gtk-doc.make both try to define EXTRA_DIST
Remove the EXTRA_DIST line in Makefile.decl, and fix warnings in Makefile.am
files.
Makefile.am | 2 ++
Makefile.decl | 1 -
src/Makefile.am | 2 ++
3 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c311329..67eda23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST =
+
include $(top_srcdir)/Makefile.decl
ACLOCAL_AMFLAGS = -I m4
diff --git a/Makefile.decl b/Makefile.decl
index 4c14ff8..092a0f3 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -4,7 +4,6 @@ GTESTER = gtester
GTESTER_REPORT = gtester-report
# initialize variables for unconditional += appending
-EXTRA_DIST =
TEST_PROGS =
### testing rules
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e90627..0f4db64 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+EXTRA_DIST =
+
include $(top_srcdir)/Makefile.decl
SUBDIRS = . tests
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]