summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2007-12-18 09:42:57 +0000
committerTim-Philipp Müller <tim@centricular.net>2007-12-18 09:42:57 +0000
commitfb66fbf3714aba6c42d3e26b024f02c2c8567aad (patch)
tree943f30705d1ae84a00ac9dbb6f66ce5f85c6d8b3 /Makefile.am
parentd4fc743d0684588a6543291b6a3d0f1c562145dd (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). * win32/vs6/gst_python.dsw: * win32/vs6/libgstpython.dsp: * win32/vs6/pygenfiles.dsp: Fix line endings and do cvs admin -kb.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 9cd3ced..970247c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,11 @@
SUBDIRS = codegen gst examples testsuite pkgconfig
-win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
common_cflags = $(PYGOBJECT_CFLAGS) $(GST_CFLAGS) $(GST_OPTION_CFLAGS) -fno-strict-aliasing
common_libadd = $(GST_LIBS) $(GST_OPTION_LIBS)
common_ldflags = -module -avoid-version
-debug:
- echo $(win32)
+# include before EXTRA_DIST for win32 assignment
+include $(top_srcdir)/common/win32.mak
ACLOCAL_AMFLAGS = -I common/m4