X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Makefile.am;h=12cb59a8ca4fb4ea1e026ba15946cc053b6c1483;hb=795ec802a99d8cbc6f8b686b9ec939de79d238c1;hp=0f0be61ef87c0887d55917bdc63e66d2cf739353;hpb=1584d16b1c8d21c095d41f549fc893dd1fe01e2a;p=platform%2Fupstream%2Fgst-plugins-good.git

diff --git a/Makefile.am b/Makefile.am
index 0f0be61..12cb59a 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,29 +9,23 @@ ALWAYS_SUBDIRS =		\
 	m4			\
 	pkgconfig
 
-SUBDIRS = 			\
-	$(ALWAYS_SUBDIRS)	\
-	$(GCONF_DIR)
-
-DIST_SUBDIRS = 			\
-	$(ALWAYS_SUBDIRS)	\
-	gconf
+SUBDIRS = $(ALWAYS_SUBDIRS)
 
-
-# include before EXTRA_DIST for win32 assignment
-include $(top_srcdir)/common/win32.mak
+DIST_SUBDIRS = $(ALWAYS_SUBDIRS)
 
 EXTRA_DIST = \
-	gst-plugins-good.spec depcomp \
+	depcomp \
 	AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
 	ChangeLog gst-plugins-good.doap autogen.sh \
-	$(win32)
+	$(shell find "$(top_srcdir)" -type f -name meson.build ! -path "$(top_srcdir)/$(PACKAGE_TARNAME)-*" ) \
+	meson_options.txt
 
 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
 
@@ -45,30 +33,49 @@ 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:
-	cd tests/check && make torture
+	$(MAKE) -C tests/check torture
+build-checks:
+	$(MAKE) -C tests/check build-checks
 else
 check-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)/gst-plugins-good.spec \
+	$(top_builddir)/win32/common/config.h-new \
 	$(top_builddir)/common/shave \
 	$(top_builddir)/common/shave-libtool \
+	$(top_builddir)/docs/plugins/xml/plugin-shout2send.xml \
+	$(top_builddir)/ext/pulse/.libs/libgstpulse.so \
+	$(top_builddir)/ext/soup/.libs/libgstsouphttpsrc.so \
+	$(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}
+	$(top_builddir)/gst/videofilter/.libs/*gamma.{so,dll,DLL,dylib} \
+	$(top_builddir)/sys/directsound/.libs/libgstdirectsoundsink.{dll,DLL} \
+	$(top_builddir)/sys/oss4/.libs/libgstoss4audio.so \
+	$(top_builddir)/sys/waveform/.libs/libgstwaveformsink.{dll,DLL}
+
+CRUFT_DIRS = \
+	$(top_srcdir)/docs/plugins/tmpl \
+	$(top_srcdir)/gst/median \
+	$(top_srcdir)/gst/qtdemux \
+	$(top_srcdir)/gst/quicktime \
+	$(top_srcdir)/ext/annodex \
+	$(top_srcdir)/tests/examples/pulse
 
 include $(top_srcdir)/common/cruft.mak