summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-12-18 09:26:42 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-12-18 09:26:42 +0000
commit892ee3299e62ca117d3f26575218eb2a723542d6 (patch)
tree8c274d832ae32af354ab1e82e84c6332eadb235c /Makefile.am
parent4625e68226117c9e57939d66fafd26c3fba7470c (diff)
downloadgst-plugins-bad-892ee3299e62ca117d3f26575218eb2a723542d6.tar.gz
gst-plugins-bad-892ee3299e62ca117d3f26575218eb2a723542d6.tar.bz2
gst-plugins-bad-892ee3299e62ca117d3f26575218eb2a723542d6.zip
Makefile.am: Include common/win32.mak for CRLF check of win32 project files (see #393626).
Original commit message from CVS: * Makefile.am: Include common/win32.mak for CRLF check of win32 project files (see #393626). * configure.ac: Bump requirements to -base CVS for libgstvideo additions in glimagesink. Disable glimagesink until the missing files get checked in.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index 53772847..8b2e3f6d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,8 @@ DIST_SUBDIRS = \
m4 common docs tests po \
examples
-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-bad.spec depcomp \