X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=c6da764618eaef04d7e03099a51761a416efed00;hb=1421fc558e138c6e7c8ba4e3a835c12102e05946;hp=d76179856dba3fa3c9cf7c4b75339dbc52003f17;hpb=1228d439e34f29b0b2c17c9a8176bcaa5473d008;p=platform%2Fupstream%2Fgst-plugins-good.git

diff --git a/Makefile.am b/Makefile.am
index d761798..c6da764 100644
--- 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,44 @@ 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)/gst/median \
+	$(top_srcdir)/gst/qtdemux \
+	$(top_srcdir)/gst/quicktime \
+	$(top_srcdir)/ext/annodex
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: check-cruft