mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 08:46:40 +00:00
build: make autotools put all .m4 cruft into m4/ rather than polluting common/m4
This commit is contained in:
parent
8b1ec41d08
commit
4faf186ea3
5 changed files with 41 additions and 47 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -34,3 +34,5 @@ bindings/python/rtspserver.c
|
|||
tags
|
||||
gst-rtsp.spec
|
||||
stamp-h.in
|
||||
|
||||
/m4/*m4
|
||||
|
|
43
Makefile.am
43
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
|
||||
all-local: check-cruft
|
||||
|
|
|
@ -52,6 +52,7 @@ AS_AUTOTOOLS_ALTERNATE
|
|||
|
||||
dnl Add parameters for aclocal
|
||||
AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I common/m4")
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
dnl set up gettext
|
||||
dnl the version check needs to stay here because autopoint greps for it
|
||||
|
@ -282,7 +283,6 @@ Makefile
|
|||
gst-rtsp.spec
|
||||
common/Makefile
|
||||
common/m4/Makefile
|
||||
m4/Makefile
|
||||
gst/Makefile
|
||||
gst/rtsp-server/Makefile
|
||||
examples/Makefile
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
EXTRA_DIST = \
|
||||
codeset.m4
|
||||
gettext.m4
|
||||
glibc21.m4 \
|
||||
iconv.m4 \
|
||||
intdiv0.m4 \
|
||||
inttypes-pri.m4 \
|
||||
nttypes.m4 \
|
||||
inttypes_h.m4 \
|
||||
isc-posix.m4 \
|
||||
lcmessage.m4 \
|
||||
lib-ld.m4 \
|
||||
lib-link.m4 \
|
||||
lib-prefix.m4 \
|
||||
progtest.m4 \
|
||||
stdint_h.m4 \
|
||||
uintmax_t.m4 \
|
||||
ulonglong.m4
|
|
@ -1,23 +0,0 @@
|
|||
# codeset.m4 serial AM1 (gettext-0.10.40)
|
||||
dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
|
||||
dnl This file is free software, distributed under the terms of the GNU
|
||||
dnl General Public License. As a special exception to the GNU General
|
||||
dnl Public License, this file may be distributed as part of a program
|
||||
dnl that contains a configuration script generated by Autoconf, under
|
||||
dnl the same distribution terms as the rest of that program.
|
||||
|
||||
dnl From Bruno Haible.
|
||||
|
||||
AC_DEFUN([AM_LANGINFO_CODESET],
|
||||
[
|
||||
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
|
||||
[AC_TRY_LINK([#include <langinfo.h>],
|
||||
[char* cs = nl_langinfo(CODESET);],
|
||||
am_cv_langinfo_codeset=yes,
|
||||
am_cv_langinfo_codeset=no)
|
||||
])
|
||||
if test $am_cv_langinfo_codeset = yes; then
|
||||
AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
|
||||
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
|
||||
fi
|
||||
])
|
Loading…
Reference in a new issue