diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-12-18 09:31:39 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-12-18 09:31:39 +0000 |
| commit | ecadbbced7a580ff0ff990e65c97490ecefed9ca (patch) | |
| tree | b812e861ee560d8a9c3988dd750ec43859e1e851 | |
| parent | a0bae2f656e1e42dc45b278eab86780589956d72 (diff) | |
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).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| m--------- | common | 0 |
3 files changed, 8 insertions, 4 deletions
@@ -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-17 Sebastian Dröge <slomo@circular-chaos.org> * 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 -Subproject 208ef72f86e944e6ba6941c68e57ffcea8d2a8f +Subproject 67b8f4e3c576945f4d778c9040876af3a5a0756 |