diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-10-15 17:13:36 +0200 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-10-15 17:13:36 +0200 |
| commit | eeb8e7c8beef83fe8c23bde888a1081fc9e8e3ec (patch) | |
| tree | daca0d83cfe2d071518692475b5b0ca09d3a0d95 /Makefile.am | |
| parent | 7b9e39724eeecf33dde3b0e4fd9f205480afb977 (diff) | |
| parent | 3cf01bf56e66657da795e43f09fa2499b2381dc9 (diff) | |
Merge branch 'maint'
* maint:
Makefile.am: Add missing files to distribution, improve maintainer-clean
configure.in: Extract API version from zmq.h
Added bin directory to ignore list.
Conflicts:
configure.in
include/zmq.h
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 09706c4..e7d221f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,17 @@ SUBDIRS = src doc perf devices tests DIST_SUBDIRS = src doc perf devices tests builds/msvc EXTRA_DIST = \ -$(top_srcdir)/foreign/openpgm/@pgm_basename@.tar.gz \ -$(top_srcdir)/foreign/xmlParser/xmlParser.cpp \ -$(top_srcdir)/foreign/xmlParser/xmlParser.hpp + autogen.sh \ + version.sh \ + MAINTAINERS \ + foreign/openpgm/@pgm_basename@.tar.gz \ + foreign/xmlParser/xmlParser.cpp \ + foreign/xmlParser/xmlParser.hpp +MAINTAINERCLEANFILES = \ + $(srcdir)/aclocal.m4 \ + $(srcdir)/autom4te.cache \ + $(srcdir)/configure \ + `find "$(srcdir)" -type f -name Makefile.in -print` dist-hook: @if test -d "$(srcdir)/.git"; \ @@ -26,4 +34,5 @@ dist-hook: -rm -rf $(distdir)/foreign/openpgm/@pgm_basename@ distclean-local: -rm -rf $(top_srcdir)/foreign/openpgm/@pgm_basename@ - +maintainer-clean-local: + -rm -rf $(top_srcdir)/config |