g_thread_create() is deprecated in GLib master, use g_thread_try_new() instead

[glsdk/gstreamer0-10.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 13ce24305de22bf075d35d44f2d6e794fbd6c2f5..383dfc7669720944c53a51a5c1aa73cd637fb6b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,7 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-docbook
 
-all-local: gst-element-check-@GST_MAJORMINOR@.m4
-
-gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
-       cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
-
 # note: keep in sync with configure.ac
-ACLOCAL_AMFLAGS = -I common/m4 -I .
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
@@ -15,6 +10,7 @@ SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
        docs \
        po \
+       m4 \
        common
 
 # These are all the possible subdirs
@@ -22,6 +18,7 @@ DIST_SUBDIRS = pkgconfig \
        gst libs plugins tools tests \
        docs \
        po \
+       m4 \
        common
 
 # include before EXTRA_DIST for win32 assignment
@@ -29,10 +26,10 @@ include $(top_srcdir)/common/win32.mak
 
 EXTRA_DIST = \
        gstreamer.spec gstreamer.spec.in \
-       check-checks.m4 \
        gst-element-check.m4.in \
        configure.ac autogen.sh depcomp \
        MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
+       scripts/gst-uninstalled \
        $(win32)
 
 CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
@@ -99,14 +96,17 @@ endif
 # FIXME: this target should be run every time we do "make release"
 # find a way of automating that
 win32-update:
-       for f in gstversion.h gstenumtypes.c gstenumtypes.h; do \
+       for f in gstversion.h gstenumtypes.c gstenumtypes.h gstmarshal.c gstmarshal.h; do \
                cp $(top_builddir)/gst/$$f win32/common; done
        $(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c
+       $(top_srcdir)/tools/gst-indent win32/common/gstenumtypes.c
+       $(top_srcdir)/tools/gst-indent win32/common/gstmarshal.c
+       $(top_srcdir)/tools/gst-indent win32/common/gstmarshal.c
        cp $(top_builddir)/win32/common/config.h-new \
                $(top_srcdir)/win32/common/config.h
 
 check-enum-gettypes: $(top_builddir)/gst/gstenumtypes.h
-       echo 'Checking if all enum and flag _get_type() funcs are inited in gst_init()';                         \
+       @echo 'Checking if all enum and flag _get_type() funcs are inited in gst_init()';                        \
        FUNCS=`grep '_get_type (' gst/gstenumtypes.h | sed -e 's/^.*gst_/gst_/' -e 's/_get_type.*$$/_get_type/'`;\
        MISSING_FUNCS='';                                                                                        \
        for f in $$FUNCS; do                                                                                     \
@@ -151,3 +151,55 @@ endif
 endif
 
 check: $(CHECK_EXPORTS) check-enum-gettypes
+
+gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
+       $(AM_V_GEN)cp gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
+
+# cruft: plugins that have been merged or moved or renamed
+
+CRUFT_FILES = \
+       $(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
+
+CRUFT_DIRS = \
+       $(top_builddir)/tests/examples/xml \
+       $(top_builddir)/gst/tmp-introspect* \
+       $(top_builddir)/libs/gst/*/tmp-introspect*
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: gst-element-check-@GST_MAJORMINOR@.m4 check-cruft