diff --git a/Makefile.am b/Makefile.am
index 7bb7d31e468311fb42332423738385e61e6b1bb2..08ceae8f854e9493f3eb5eb75b63b5d703768517 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
SUBDIRS = \
- gst-libs gst ext docs m4 tests common po
+ gst-libs gst ext docs m4 tests common pkgconfig po
-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-ugly.spec depcomp \
check-torture:
true
endif
+
+win32-update:
+ cp $(top_builddir)/win32/common/config.h-new \
+ $(top_builddir)/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
+
+include $(top_srcdir)/common/cruft.mak
+
+all-local: check-cruft