diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-08 00:03:41 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-08 00:03:41 -0400 |
| commit | 3736bbc56bd4cf5b0326a2d14a370f11e58ead83 (patch) | |
| tree | 922686ad7e9e1dc3bfbaa4a75599e4be43620b87 /src/combined | |
| parent | d7308052a0aeb970f7cf6ebc9ed73992858364e9 (diff) | |
| download | xine-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/combined')
| -rw-r--r-- | src/combined/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am index 884fcf0cc..64655c1eb 100644 --- a/src/combined/Makefile.am +++ b/src/combined/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) + if HAVE_WAVPACK xineplug_wavpack = xineplug_wavpack.la endif @@ -11,11 +14,10 @@ endif xineplug_LTLIBRARIES = $(xineplug_wavpack) $(xineplug_flac) xineplug_wavpack_la_SOURCES = demux_wavpack.c decoder_wavpack.c combined_wavpack.c combined_wavpack.h -xineplug_wavpack_la_CFLAGS = $(VISIBILITY_FLAG) $(WAVPACK_CFLAGS) -I$(srcdir)/../demuxers +xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS) +xineplug_wavpack_la_CPPFLAGS = -I$(srcdir)/../demuxers xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS) -xineplug_wavpack_la_LDFLAGS = $(xineplug_ldflags) xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c demux_flac.h -xineplug_flac_la_CFLAGS = $(VISIBILITY_FLAG) $(LIBFLAC_CFLAGS) +xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS) xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS) -xineplug_flac_la_LDFLAGS = $(xineplug_ldflags) |