diff options
| author | Gordon Sim <gsim@apache.org> | 2008-08-19 21:04:35 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-08-19 21:04:35 +0000 |
| commit | 4ac9fe566333f24c9a3f880eef8ec6acf6de234e (patch) | |
| tree | bb3f6650a3abb812da6a78ac272630748c9eed9c | |
| parent | ce22e996fb7ecbf0a31a088349123d7f2fa919fd (diff) | |
| download | qpid-python-4ac9fe566333f24c9a3f880eef8ec6acf6de234e.tar.gz | |
Build tweaks for distcheck:
* ensure examples dirs are writable so executables can be compiled
* cleanup files on distclean
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-10@687156 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | cpp/etc/Makefile.am | 2 | ||||
| -rw-r--r-- | cpp/examples/Makefile.am | 5 | ||||
| -rw-r--r-- | cpp/src/tests/Makefile.am | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/cpp/etc/Makefile.am b/cpp/etc/Makefile.am index 6c7fa13c29..0affcf0edf 100644 --- a/cpp/etc/Makefile.am +++ b/cpp/etc/Makefile.am @@ -9,7 +9,7 @@ nobase_sysconf_DATA = \ if HAVE_SASL SASL_DB = qpidd.sasldb - +DISTCLEANFILES=$(SASL_DB) nobase_sysconf_DATA += \ $(SASL_CONF) diff --git a/cpp/examples/Makefile.am b/cpp/examples/Makefile.am index b046540b92..001e276950 100644 --- a/cpp/examples/Makefile.am +++ b/cpp/examples/Makefile.am @@ -61,9 +61,12 @@ abs_top_srcdir=@abs_top_srcdir@ # Build the examples - copy sources to the build tree in VPATH build. all-local: - test -d examples || cp -R $(srcdir)/examples . + test -d examples || cp -R $(srcdir)/examples . && chmod +w -R examples cd examples && $(MAKE) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS) -I$(abs_top_srcdir)/src -I$(abs_top_srcdir)/src/gen -I$(abs_top_builddir)/src -I$(abs_top_builddir)/src/gen -L$(abs_top_builddir)/src/.libs -Wl,-rpath,$(abs_top_builddir)/src/.libs" all +distclean-local: + rm -rf examples + if !HAVE_XML exclude_examples_regexp="xml" # Exclude XML examples. endif diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 57d1c04b72..3958b57fcc 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -143,6 +143,7 @@ libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir) libdlclose_noop_la_SOURCES = dlclose_noop.c CLEANFILES+=valgrind.out *.log *.vglog* dummy_test $(unit_wrappers) +DISTCLEANFILES=.valgrind.supp .valgrindrc # FIXME aconway 2008-05-23: Disabled interop_runner because it uses # the obsolete Channel class. Convert to Session and re-enable. |