From a26db008ffe2ac09afc69320ee9f116e27efbf10 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Fri, 28 May 2010 17:00:11 +0000
Subject: Fixed conflicting clean-local targets, causing make distcheck to
 fail.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@949231 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/tests/Makefile.am | 5 ++++-
 qpid/cpp/src/tests/ssl.mk      | 3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'qpid/cpp/src')

diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index b392a124d1..9a0fac9bbb 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -41,6 +41,7 @@ TESTS=
 EXTRA_DIST=
 CLEANFILES=
 LONG_TESTS=
+CLEAN_LOCAL=
 
 #
 # Destination for intalled programs and tests defined here
@@ -396,7 +397,9 @@ sasl_config: sasl_test_setup.sh
 	sh $(srcdir)/sasl_test_setup.sh
 	touch sasl_config
 
+CLEAN_LOCAL += sasl_config
+
 clean-local:
-	rm -rf sasl_config
+	rm -rf $(CLEAN_LOCAL)
 
 include testagent.mk
diff --git a/qpid/cpp/src/tests/ssl.mk b/qpid/cpp/src/tests/ssl.mk
index cb887c8fda..435db0c55b 100644
--- a/qpid/cpp/src/tests/ssl.mk
+++ b/qpid/cpp/src/tests/ssl.mk
@@ -19,5 +19,4 @@
 
 TESTS+=ssl_test
 EXTRA_DIST+=ssl_test
-clean-local:
-	rm -rf test_cert_db cert.password
\ No newline at end of file
+CLEAN_LOCAL += test_cert_db cert.password
-- 
cgit v1.2.1