jitterbuffer: Upgrade debug message to error

[platform/upstream/gst-plugins-good.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d761798..6c9786f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,5 @@
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 
-if USE_GCONFTOOL
-GCONF_DIR = gconf
-else
-GCONF_DIR =
-endif
-
 ALWAYS_SUBDIRS =               \
        gst sys ext             \
        tests                   \
@@ -15,31 +9,25 @@ ALWAYS_SUBDIRS =             \
        m4                      \
        pkgconfig
 
-SUBDIRS =                      \
-       $(ALWAYS_SUBDIRS)       \
-       $(GCONF_DIR)
-
-DIST_SUBDIRS =                         \
-       $(ALWAYS_SUBDIRS)       \
-       gconf
+SUBDIRS = $(ALWAYS_SUBDIRS)
 
+DIST_SUBDIRS = $(ALWAYS_SUBDIRS)
 
-win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
-
-debug:
-       echo $(win32)
+# include before EXTRA_DIST for win32 assignment
+include $(top_srcdir)/common/win32.mak
 
 EXTRA_DIST = \
        gst-plugins-good.spec depcomp \
        AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
-       ChangeLog autogen.sh \
+       ChangeLog gst-plugins-good.doap autogen.sh \
        $(win32)
 
 DISTCLEANFILES = _stdint.h
 
 noinst_HEADERS = \
        gst-libs/gst/gettext.h \
-       gst-libs/gst/gst-i18n-plugin.h
+       gst-libs/gst/gst-i18n-plugin.h \
+       gst-libs/gst/glib-compat-private.h
 
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
@@ -47,7 +35,45 @@ include $(top_srcdir)/common/release.mak
 include $(top_srcdir)/common/po.mak
 
 check-valgrind:
-       cd tests/check && make check-valgrind
+       $(MAKE) -C tests/check check-valgrind
 
+if HAVE_GST_CHECK
+check-torture:
+       $(MAKE) -C tests/check torture
+build-checks:
+       $(MAKE) -C tests/check build-checks
+else
 check-torture:
-       cd tests/check && make torture
+       true
+build-checks:
+       true
+endif
+
+win32-update:
+       cp $(top_builddir)/win32/common/config.h-new \
+           $(top_srcdir)/win32/common/config.h
+
+include $(top_srcdir)/common/coverage/lcov.mak
+
+# cruft: plugins that have been merged or moved or renamed
+
+CRUFT_FILES = \
+       $(top_builddir)/common/shave \
+       $(top_builddir)/common/shave-libtool \
+       $(top_builddir)/gst/median/.libs/*.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/qtdemux/.libs/*.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/quicktime/.libs/*.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/videofilter/.libs/*videoflip.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/videofilter/.libs/*videobalance.{so,dll,DLL,dylib} \
+       $(top_builddir)/gst/videofilter/.libs/*gamma.{so,dll,DLL,dylib}
+
+CRUFT_DIRS = \
+       $(top_srcdir)/docs/plugins/tmpl \
+       $(top_srcdir)/gst/median \
+       $(top_srcdir)/gst/qtdemux \
+       $(top_srcdir)/gst/quicktime \
+       $(top_srcdir)/ext/annodex
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: check-cruft