From ecadbbced7a580ff0ff990e65c97490ecefed9ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 18 Dec 2007 09:31:39 +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 0823514..1bcf9b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-12-18 Tim-Philipp Müller + + * Makefile.am: + Include common/win32.mak for CRLF check of win32 project + files (see #393626). + 2007-12-17 Sebastian Dröge * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), diff --git a/Makefile.am b/Makefile.am index b8088b0..9581bb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,10 +2,8 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc SUBDIRS = $(FFMPEG_SUBDIRS) ext docs common tests -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-ffmpeg.spec depcomp ffmpegrev \ diff --git a/common b/common index 208ef72..67b8f4e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 208ef72f86e944e6ba6941c68e57ffcea8d2a8f4 +Subproject commit 67b8f4e3c576945f4d778c9040876af3a5a0756e -- 2.7.4