From 341dbe135f1a09bae81457a9555aa6f1027a3dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Tue, 18 Dec 2007 09:07:53 +0000
Subject: [PATCH] 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).
---
 ChangeLog   | 6 ++++++
 Makefile.am | 6 ++----
 common      | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5056c8b7d..636de26dad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-18  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* Makefile.am:
+	  Include common/win32.mak for CRLF check of win32 project
+	  files (see #393626).
+
 2007-12-13  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/mpegaudioparse/gstmpegaudioparse.c:
diff --git a/Makefile.am b/Makefile.am
index 7bb7d31e46..398b7293c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,8 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
 SUBDIRS = \
 	gst-libs gst ext docs m4 tests common 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 \
diff --git a/common b/common
index fb7ab03319..67b8f4e3c5 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit fb7ab03319930496e922173d54f6dfccfff6f357
+Subproject commit 67b8f4e3c576945f4d778c9040876af3a5a0756e