From 3736bbc56bd4cf5b0326a2d14a370f11e58ead83 Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Tue, 8 May 2007 00:03:41 -0400 Subject: 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 --- src/liba52/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/liba52') diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 6a0aebe62..948a7ab28 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) + if A52 a52_module = xineplug_decode_a52.la endif @@ -27,9 +30,6 @@ else xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -lm endif -xineplug_decode_a52_la_CFLAGS = $(VISIBILITY_FLAG) -xineplug_decode_a52_la_LDFLAGS = $(xineplug_ldflags) - noinst_HEADERS = \ a52.h \ a52_internal.h \ -- cgit v1.2.3 From 67b0ebb21185cb8ea2972dead6870bab8306724e Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Fri, 11 May 2007 19:28:18 -0400 Subject: Another round of Makefile.am cleanups --- src/liba52/Makefile.am | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'src/liba52') diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 948a7ab28..9eec4f6d2 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,16 +1,22 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) +noinst_HEADERS = \ + a52.h \ + a52_internal.h \ + bitstream.h \ + tables.h \ + crc.c + if A52 -a52_module = xineplug_decode_a52.la +xineplug_LTLIBRARIES = xineplug_decode_a52.la endif -xineplug_LTLIBRARIES = $(a52_module) - if EXTERNAL_A52DEC internal_sources = +external_libs = -la52 else internal_sources = \ bitstream.c \ @@ -18,21 +24,11 @@ internal_sources = \ downmix.c \ imdct.c \ parse.c +external_libs = endif xineplug_decode_a52_la_SOURCES = \ xine_a52_decoder.c \ $(internal_sources) -if EXTERNAL_A52DEC -xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -lm -else -xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -lm -endif - -noinst_HEADERS = \ - a52.h \ - a52_internal.h \ - bitstream.h \ - tables.h \ - crc.c +xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(external_libs) -lm -- cgit v1.2.3 From d1b1501547f9415ac6ee38bc99f528d9dcfdf21d Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Mon, 14 May 2007 23:24:01 -0400 Subject: Final pass over decoders.m4 --- src/liba52/Makefile.am | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'src/liba52') diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 9eec4f6d2..1025b373d 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -3,32 +3,19 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) -noinst_HEADERS = \ - a52.h \ - a52_internal.h \ - bitstream.h \ - tables.h \ - crc.c +noinst_HEADERS = a52.h a52_internal.h bitstream.h tables.h crc.c -if A52 +if ENABLE_A52DEC xineplug_LTLIBRARIES = xineplug_decode_a52.la endif -if EXTERNAL_A52DEC -internal_sources = +if WITH_EXTERNAL_A52DEC external_libs = -la52 +internal_sources = else -internal_sources = \ - bitstream.c \ - bit_allocate.c \ - downmix.c \ - imdct.c \ - parse.c external_libs = +internal_sources = bitstream.c bit_allocate.c downmix.c imdct.c parse.c endif -xineplug_decode_a52_la_SOURCES = \ - xine_a52_decoder.c \ - $(internal_sources) - +xineplug_decode_a52_la_SOURCES = xine_a52_decoder.c $(internal_sources) xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(external_libs) -lm -- cgit v1.2.3