diff options
| author | Alan Conway <aconway@apache.org> | 2010-05-28 17:00:11 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-05-28 17:00:11 +0000 |
| commit | a26db008ffe2ac09afc69320ee9f116e27efbf10 (patch) | |
| tree | cb862521e0c1549412758a77cd1ecd15aa0b394d /qpid/cpp | |
| parent | 3f2cae3c19228d10257022e851c994a9d337dbc8 (diff) | |
| download | qpid-python-a26db008ffe2ac09afc69320ee9f116e27efbf10.tar.gz | |
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
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/src/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/ssl.mk | 3 |
2 files changed, 5 insertions, 3 deletions
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 |