ext/taglib/: Remove useless typedefs without new type name. Fixes a warning with...

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

diff --git a/Makefile.am b/Makefile.am
index 866b95a..17f646c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,49 +1,51 @@
-if BUILD_DOCS
-# disabled until it actually works
-# SUBDIRS_DOCS = docs
-SUBDIRS_DOCS =
+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+
+if USE_GCONFTOOL
+GCONF_DIR = gconf
 else
-SUBDIRS_DOCS =
+GCONF_DIR =
 endif
 
-# if USE_GCONFTOOL
-# GCONF_DIR = gconf
-# else
-# GCONF_DIR =
-# endif
+ALWAYS_SUBDIRS =               \
+       gst sys ext             \
+       tests                   \
+       docs                    \
+       po                      \
+       common                  \
+       m4                      \
+       pkgconfig
 
 SUBDIRS =                      \
-       gst sys ext             \
-       $(GCONF_DIR)            \
-       m4                      
-# disabled
-#      $(SUBDIRS_DOCS)
+       $(ALWAYS_SUBDIRS)       \
+       $(GCONF_DIR)
 
 DIST_SUBDIRS =                         \
-       gst sys ext             \
-       m4 
+       $(ALWAYS_SUBDIRS)       \
+       gconf
+
 
-# disabled
-#      docs
+# include before EXTRA_DIST for win32 assignment
+include $(top_srcdir)/common/win32.mak
 
 EXTRA_DIST = \
-       gst-plugins.spec depcomp \
-       AUTHORS COPYING COPYING.LIB NEWS README RELEASE REQUIREMENTS \
-       ChangeLog autogen.sh
+       gst-plugins-good.spec depcomp \
+       AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
+       ChangeLog gst-plugins-good.doap autogen.sh \
+       $(win32)
 
 DISTCLEANFILES = _stdint.h
 
-# check that no marshal or enumtypes files are included
-# this in turn ensures that distcheck fails for missing .list files which is currently
-# shadowed when the corresponding .c and .h files are included.
-distcheck-hook:
-       @test "x" = "x`find $(distdir) -name \*-enumtypes.[ch]`" && \
-       test "x" = "x`find $(distdir) -name \*-marshal.[ch]`" || \
-       ( $(ECHO) "*** Leftover enumtypes or marshal files in the tarball." && \
-          $(ECHO) "*** Make sure the following files are not disted:" && \
-          find $(distdir) -name \*-enumtypes.[ch] && \
-          find $(distdir) -name \*-marshal.[ch] && \
-          false )
-
-# include $(top_srcdir)/common/release.mak
-# include $(top_srcdir)/common/po.mak
+noinst_HEADERS = \
+       gst-libs/gst/gettext.h \
+       gst-libs/gst/gst-i18n-plugin.h
+
+ACLOCAL_AMFLAGS = -I m4 -I common/m4
+
+include $(top_srcdir)/common/release.mak
+include $(top_srcdir)/common/po.mak
+
+check-valgrind:
+       cd tests/check && make check-valgrind
+
+check-torture:
+       cd tests/check && make torture