From 7e1ccbe0c512fbeed6eb4f938dd1aac79d0b33ba Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 26 Oct 2009 11:56:57 +0100
Subject: [PATCH] Makefile.am: Use noinst_DATA instead of all-local target

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
 Makefile.am | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a62a3e467..71a2c3288 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,7 +170,16 @@ docdot = \
 
 docpng = $(patsubst %.dot,%.png,$(docdot))
 
-noinst_DATA = $(manhtml) doc/html
+# Things to build but not to install (add it to EXTRA_DIST if it should be
+# distributed)
+noinst_DATA = \
+	devel/upload \
+	doc/html \
+	doc/examples/bash_completion \
+	doc/examples/ganeti.cron \
+	doc/examples/ganeti.initd \
+	doc/examples/hooks/ipsec \
+	$(manhtml)
 
 gnt_scripts = \
 	scripts/gnt-backup \
@@ -312,11 +321,6 @@ srclink_files = \
 check_python_code = \
 	$(all_python_code)
 
-all-local: devel/upload \
-	doc/examples/bash_completion \
-	doc/examples/ganeti.initd doc/examples/ganeti.cron \
-	doc/examples/hooks/ipsec
-
 devel/upload: devel/upload.in $(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 	chmod u+x $@
-- 
GitLab