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/xine-utils/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/xine-utils') diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 95de06b9e..1e58d9fc1 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -1,6 +1,5 @@ include $(top_srcdir)/misc/Makefile.common -LIBTOOL = $(SHELL) $(top_builddir)/libtool noinst_LTLIBRARIES = libxineutils.la EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl @@ -11,7 +10,7 @@ pppc_files = ppcasm_string.S endif endif -AM_CFLAGS = $(X_CFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG) AM_CPPFLAGS=-DXINE_LIBRARY_COMPILE libxineutils_la_SOURCES = $(pppc_files) \ -- cgit v1.2.3 From 722010dbea5887558dd7d954a19d918119e37b4f Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Thu, 10 May 2007 15:48:44 -0400 Subject: Rename PPC_ARCH to ARCH_PPC for consistency. Move the definition of it to a much more appropriate location. --- src/xine-utils/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/xine-utils') diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 1e58d9fc1..484830cf9 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -1,18 +1,18 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = -DXINE_LIBRARY_COMPILE + noinst_LTLIBRARIES = libxineutils.la EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl -if PPC_ARCH +if ARCH_PPC if !HOST_OS_DARWIN pppc_files = ppcasm_string.S endif endif -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS=-DXINE_LIBRARY_COMPILE - libxineutils_la_SOURCES = $(pppc_files) \ cpu_accel.c \ color.c \ -- cgit v1.2.3 From 913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Fri, 11 May 2007 18:24:25 -0400 Subject: Another pass at cleaning up Makefile.am files. More to come. --- src/xine-utils/Makefile.am | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src/xine-utils') diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 484830cf9..a9c37465a 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -3,10 +3,25 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG) AM_CPPFLAGS = -DXINE_LIBRARY_COMPILE -noinst_LTLIBRARIES = libxineutils.la - EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl +noinst_HEADERS = ppcasm_string.h xine_check.h + +xineinclude_HEADERS = \ + attributes.h \ + compat.h \ + xine_buffer.h \ + xineutils.h \ + xmllexer.h \ + xmlparser.h \ + list.h \ + array.h \ + sorted_array.h \ + pool.h \ + ring_buffer.h + +noinst_LTLIBRARIES = libxineutils.la + if ARCH_PPC if !HOST_OS_DARWIN pppc_files = ppcasm_string.S @@ -31,19 +46,3 @@ libxineutils_la_SOURCES = $(pppc_files) \ pool.c \ ring_buffer.c -xineinclude_HEADERS = \ - attributes.h \ - compat.h \ - xine_buffer.h \ - xineutils.h \ - xmllexer.h \ - xmlparser.h \ - list.h \ - array.h \ - sorted_array.h \ - pool.h \ - ring_buffer.h - - -noinst_HEADERS = ppcasm_string.h xine_check.h - -- cgit v1.2.3