summaryrefslogtreecommitdiff
path: root/src/post/deinterlace/plugins
diff options
context:
space:
mode:
authorMatt Messier <mmessier@grapetv.org>2007-05-08 00:03:41 -0400
committerMatt Messier <mmessier@grapetv.org>2007-05-08 00:03:41 -0400
commit3736bbc56bd4cf5b0326a2d14a370f11e58ead83 (patch)
tree922686ad7e9e1dc3bfbaa4a75599e4be43620b87 /src/post/deinterlace/plugins
parentd7308052a0aeb970f7cf6ebc9ed73992858364e9 (diff)
downloadxine-lib-3736bbc56bd4cf5b0326a2d14a370f11e58ead83.tar.gz
xine-lib-3736bbc56bd4cf5b0326a2d14a370f11e58ead83.tar.bz2
RIP: AC_OPTIMIZATIONS
-- Removed m4/optimizations.m4, and along with it, AC_OPTIMIZATIONS. -- Stripped down, cleaned up, and merged the former together with other compiler characteristic checks. -- Do not set any optimization flags into CFLAGS. Update all Makefile.am's with proper AM_CFLAGS, AM_CPPFLAGS, AM_LDFLAGS, etc. to set up optimization flags, usually from DEFAULT_OCFLAGS. -- Start cleaning up CFLAGS/CPPFLAGS stuff in Makefile.am's all over the place. -- Correct a number of places where CFLAGS itself was being mangled in Makefile to on-the-fly adjust optimizations to work around compiler bugs. This stuff is now done correctly. -- The run of automake from autogen.sh is now clean of warnings. -- Cleaned out some (now) dead macros from m4/_xine.m4 -- Mac OS X intel builds out-of-the-box now -- dropped optimization on post/deinterlace/plugins/kdetv-greedyh to O1_CFLAGS. -- OBJCFLAGS is now getting set correctly everywhere that it needs to be -- Various other miscellaneous cleanups all over
Diffstat (limited to 'src/post/deinterlace/plugins')
-rw-r--r--src/post/deinterlace/plugins/Makefile.am18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/post/deinterlace/plugins/Makefile.am b/src/post/deinterlace/plugins/Makefile.am
index dcfa60180..33cff9d7f 100644
--- a/src/post/deinterlace/plugins/Makefile.am
+++ b/src/post/deinterlace/plugins/Makefile.am
@@ -29,10 +29,17 @@ EXTRA_DIST = greedy2frame_template.c greedyh.asm \
tomsmocomp/tomsmocompmacros.h x86-64_macros.inc
# libpostproc is here so we can use their nice mangle.h
-AM_CFLAGS = -I$(top_srcdir)/src/post/deinterlace \
+AM_CFLAGS = $(VISIBILITY_FLAG)
+AM_CPPFLAGS = -I$(top_srcdir)/src/post/deinterlace \
-I$(top_srcdir)/contrib/ffmpeg/libpostproc
-noinst_LTLIBRARIES = libdeinterlaceplugins.la
+# per-object CFLAGS -- drop optimization on kdetv_greedyh.c so that gcc
+# doesn't run out of general registers trying to compile it.
+
+noinst_LTLIBRARIES = libdeinterlacepluginsO1.la libdeinterlaceplugins.la
+
+libdeinterlacepluginsO1_la_SOURCES = kdetv_greedyh.c
+libdeinterlacepluginsO1_la_CFLAGS = $(AM_CFLAGS) $(O1_CFLAGS)
libdeinterlaceplugins_la_SOURCES = \
double.c \
@@ -43,10 +50,9 @@ libdeinterlaceplugins_la_SOURCES = \
weave.c \
greedy2frame.c \
scalerbob.c \
- kdetv_greedyh.c \
kdetv_tomsmocomp.c
-libdeinterlaceplugins_la_LIBADD = $(XINE_LIB)
-libdeinterlaceplugins_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
-libdeinterlaceplugins_la_LDFLAGS = -avoid-version -module
+libdeinterlaceplugins_la_LIBADD = libdeinterlacepluginsO1.la $(XINE_LIB)
+libdeinterlaceplugins_la_CFLAGS = $(AM_CFLAGS) $(DEFAULT_OCFLAGS)
+libdeinterlaceplugins_la_LDFLAGS = $(xineplug_ldflags)
noinst_HEADERS = plugins.h greedyhmacros.h