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/libfaad/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libfaad') diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index d1a4ed865..c02810f00 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) + SUBDIRS = codebook if BUILD_FAAD @@ -10,7 +13,7 @@ xineplug_LTLIBRARIES = $(faad_module) VPATH = @srcdir@:@srcdir@/codebook: -xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing +xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing xineplug_decode_faad_la_SOURCES = \ bits.c \ cfft.c \ @@ -52,7 +55,6 @@ xineplug_decode_faad_la_SOURCES = \ tns.c \ xine_faad_decoder.c -xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags) xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) noinst_HEADERS = \ -- 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/libfaad/Makefile.am | 102 ++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 52 deletions(-) (limited to 'src/libfaad') diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index c02810f00..5f4be9cd4 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -1,61 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) -SUBDIRS = codebook - -if BUILD_FAAD -faad_module = xineplug_decode_faad.la -endif - -xineplug_LTLIBRARIES = $(faad_module) - VPATH = @srcdir@:@srcdir@/codebook: -xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing -xineplug_decode_faad_la_SOURCES = \ - bits.c \ - cfft.c \ - common.c \ - decoder.c \ - drc.c \ - drm_dec.c \ - error.c \ - filtbank.c \ - hcr.c \ - huffman.c \ - ic_predict.c \ - is.c \ - lt_predict.c \ - mdct.c \ - mp4.c \ - ms.c \ - output.c \ - pns.c \ - ps_dec.c \ - ps_syntax.c \ - pulse.c \ - rvlc.c \ - sbr_dct.c \ - sbr_dec.c \ - sbr_e_nf.c \ - sbr_fbt.c \ - sbr_hfadj.c \ - sbr_hfgen.c \ - sbr_huff.c \ - sbr_qmf.c \ - sbr_syntax.c \ - sbr_tf_grid.c \ - specrec.c \ - ssr.c \ - ssr_fb.c \ - ssr_ipqf.c \ - syntax.c \ - tns.c \ - xine_faad_decoder.c - -xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) +SUBDIRS = codebook noinst_HEADERS = \ analysis.h \ @@ -106,3 +56,51 @@ noinst_HEADERS = \ structs.h \ syntax.h \ tns.h + +if BUILD_FAAD +xineplug_LTLIBRARIES = xineplug_decode_faad.la +endif + +xineplug_decode_faad_la_SOURCES = \ + bits.c \ + cfft.c \ + common.c \ + decoder.c \ + drc.c \ + drm_dec.c \ + error.c \ + filtbank.c \ + hcr.c \ + huffman.c \ + ic_predict.c \ + is.c \ + lt_predict.c \ + mdct.c \ + mp4.c \ + ms.c \ + output.c \ + pns.c \ + ps_dec.c \ + ps_syntax.c \ + pulse.c \ + rvlc.c \ + sbr_dct.c \ + sbr_dec.c \ + sbr_e_nf.c \ + sbr_fbt.c \ + sbr_hfadj.c \ + sbr_hfgen.c \ + sbr_huff.c \ + sbr_qmf.c \ + sbr_syntax.c \ + sbr_tf_grid.c \ + specrec.c \ + ssr.c \ + ssr_fb.c \ + ssr_ipqf.c \ + syntax.c \ + tns.c \ + xine_faad_decoder.c + +xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) +xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing -- 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/libfaad/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libfaad') diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index 5f4be9cd4..379033b15 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -57,7 +57,7 @@ noinst_HEADERS = \ syntax.h \ tns.h -if BUILD_FAAD +if ENABLE_FAAD xineplug_LTLIBRARIES = xineplug_decode_faad.la endif -- cgit v1.2.3