diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-01-08 01:55:06 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2011-01-08 01:55:06 +0000 |
| commit | 4faf186ea3d151ee68e1cc89bf6dc4ee1fbca8b6 (patch) | |
| tree | fac9eeefe2582d1ca919689c5ba6115dbf9df6db /Makefile.am | |
| parent | 8b1ec41d0858fe257d2aa5db1e450e4c726d00a4 (diff) | |
build: make autotools put all .m4 cruft into m4/ rather than polluting common/m4
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 43 |
1 files changed, 38 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 802e23a..441ac00 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,6 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc SUBDIRS = \ gst \ bindings \ - m4 \ common \ pkgconfig \ docs \ @@ -16,7 +15,7 @@ EXTRA_DIST = \ AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \ gst-rtsp.spec docs/design/gst-rtp-server-design -ACLOCAL_AMFLAGS = -I common/m4 -I m4 +ACLOCAL_AMFLAGS = -I m4 -I common/m4 DISTCLEANFILES = _stdint.h gst-rtsp.spec @@ -36,9 +35,43 @@ endif # cruft: plugins that have been merged or moved or renamed CRUFT_FILES = \ - $(top_builddir)/common/shave \ - $(top_builddir)/common/shave-libtool + $(top_builddir)/common/shave \ + $(top_builddir)/common/shave-libtool \ + $(top_builddir)/common/m4/codeset.m4 \ + $(top_builddir)/common/m4/gettext.m4 \ + $(top_builddir)/common/m4/glibc2.m4 \ + $(top_builddir)/common/m4/glibc21.m4 \ + $(top_builddir)/common/m4/iconv.m4 \ + $(top_builddir)/common/m4/intdiv0.m4 \ + $(top_builddir)/common/m4/intl.m4 \ + $(top_builddir)/common/m4/intldir.m4 \ + $(top_builddir)/common/m4/intlmacosx.m4 \ + $(top_builddir)/common/m4/intmax.m4 \ + $(top_builddir)/common/m4/inttypes-pri.m4 \ + $(top_builddir)/common/m4/inttypes_h.m4 \ + $(top_builddir)/common/m4/lcmessage.m4 \ + $(top_builddir)/common/m4/lib-ld.m4 \ + $(top_builddir)/common/m4/lib-link.m4 \ + $(top_builddir)/common/m4/lib-prefix.m4 \ + $(top_builddir)/common/m4/libtool.m4 \ + $(top_builddir)/common/m4/lock.m4 \ + $(top_builddir)/common/m4/longlong.m4 \ + $(top_builddir)/common/m4/ltoptions.m4 \ + $(top_builddir)/common/m4/ltsugar.m4 \ + $(top_builddir)/common/m4/ltversion.m4 \ + $(top_builddir)/common/m4/lt~obsolete.m4 \ + $(top_builddir)/common/m4/nls.m4 \ + $(top_builddir)/common/m4/po.m4 \ + $(top_builddir)/common/m4/printf-posix.m4 \ + $(top_builddir)/common/m4/progtest.m4 \ + $(top_builddir)/common/m4/size_max.m4 \ + $(top_builddir)/common/m4/stdint_h.m4 \ + $(top_builddir)/common/m4/uintmax_t.m4 \ + $(top_builddir)/common/m4/visibility.m4 \ + $(top_builddir)/common/m4/wchar_t.m4 \ + $(top_builddir)/common/m4/wint_t.m4 \ + $(top_builddir)/common/m4/xsize.m4 include $(top_srcdir)/common/cruft.mak -all-local: check-cruft
\ No newline at end of file +all-local: check-cruft |