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/libw32dll/Makefile.am | 6 +++--- src/libw32dll/wine/Makefile.am | 14 +++++--------- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/libw32dll') diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 367dc3bda..774cc8705 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -1,6 +1,8 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\" $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\" +AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = wine DirectShow dmo qtx @@ -15,7 +17,6 @@ EXTRA_DIST = common.c xineplug_decode_w32dll_la_SOURCES = w32codec.c xineplug_decode_w32dll_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) -xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module xineplug_decode_w32dll_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_decode_w32dll_la_LIBADD = \ $(top_builddir)/src/libw32dll/wine/libwine.la \ @@ -28,7 +29,6 @@ xineplug_decode_w32dll_la_LIBADD = \ $(XDG_BASEDIR_LIBS) xineplug_decode_qt_la_SOURCES = qt_decoder.c -xineplug_decode_qt_la_LDFLAGS = -avoid-version -module xineplug_decode_qt_la_LIBADD = \ $(top_builddir)/src/libw32dll/wine/libwine.la \ $(XINE_LIB) \ diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index b53d2c078..1fd132dca 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -1,20 +1,16 @@ include $(top_srcdir)/misc/Makefile.common -LIBTOOL = $(SHELL) $(top_builddir)/libtool - EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) -AM_CFLAGS = $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ - -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ +# disable -fomit-frame-pointer, -finline-functions, and -frename-registers +# because they cause bad behavior of wine +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ + -fno-omit-frame-pointer -fno-inline-functions -fno-rename-registers +AM_CPPFLAGS = -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf -# CFLAGS is here to filter out -fomit-frame-pointer, -# -finline-functions and -frename-registers because they cause bad -# behavior of wine -CFLAGS = `echo @CFLAGS@ | sed -e 's/-fomit-frame-pointer//g;s/-finline-functions//g;s/-frename-registers//g'` if HAVE_W32DLL wine_lib = libwine.la -- cgit v1.2.3 From ff308c044bab7e8b8b55f70853925ac44a2001ad Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Tue, 8 May 2007 16:34:45 -0400 Subject: More configure.ac cleanups -- Revisit NLS stuff. Not much changed, remove the REVISIT tag -- Change XDG_BASEDIR_CFLAGS to XDG_BASEDIR_CPPFLAGS, because it only includes a -I, which is a CPPFLAGS option, not CFLAGS -- Move XDG stuff up to library checks -- Cleanup and move zlib checks -- Move X11 checks up to checks for system services -- Break audio out plugin stuff into m4/audio_out.m4 -- Break video out plugin stuff into m4/video_out.m4 -- Move libdir name stuff into m4/libFLAC.m4 since that's the only thing that uses it. --- src/libw32dll/Makefile.am | 2 +- src/libw32dll/wine/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libw32dll') diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 774cc8705..8da0e1c84 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -16,7 +16,7 @@ xineplug_LTLIBRARIES = $(w32dll_codec) $(qt_codec) EXTRA_DIST = common.c xineplug_decode_w32dll_la_SOURCES = w32codec.c -xineplug_decode_w32dll_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) +xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_decode_w32dll_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_decode_w32dll_la_LIBADD = \ $(top_builddir)/src/libw32dll/wine/libwine.la \ diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 1fd132dca..05f15f908 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -31,7 +31,7 @@ libwine_la_SOURCES = \ win32.c \ stubs.s \ wrapper.S -libwine_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) +libwine_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) noinst_HEADERS = \ avifmt.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/libw32dll/DirectShow/Makefile.am | 33 +++++++++++------------- src/libw32dll/Makefile.am | 32 ++++++++--------------- src/libw32dll/dmo/Makefile.am | 23 ++++++++--------- src/libw32dll/wine/Makefile.am | 50 +++++++++++++++++------------------- 4 files changed, 59 insertions(+), 79 deletions(-) (limited to 'src/libw32dll') diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am index a74c65815..414e6764f 100644 --- a/src/libw32dll/DirectShow/Makefile.am +++ b/src/libw32dll/DirectShow/Makefile.am @@ -1,16 +1,25 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ - -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \ +AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer +AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS \ -I$(srcdir)/.. -I$(srcdir)/../wine +noinst_HEADERS = \ + allocator.h \ + cmediasample.h \ + guids.h \ + inputpin.h \ + interfaces.h \ + iunk.h \ + outputpin.h \ + DS_AudioDecoder.h \ + DS_Filter.h \ + DS_VideoDecoder.h + if HAVE_W32DLL -ds_filter_lib = libds_filter.la +noinst_LTLIBRARIES = libds_filter.la endif -noinst_LTLIBRARIES = $(ds_filter_lib) - libds_filter_la_SOURCES = \ allocator.c \ cmediasample.c \ @@ -20,15 +29,3 @@ libds_filter_la_SOURCES = \ DS_Filter.c \ DS_AudioDecoder.c \ DS_VideoDecoder.c - -noinst_HEADERS = \ - allocator.h \ - cmediasample.h \ - guids.h \ - inputpin.h \ - interfaces.h \ - iunk.h \ - outputpin.h \ - DS_AudioDecoder.h \ - DS_Filter.h \ - DS_VideoDecoder.h diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 8da0e1c84..94dae4ab9 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -1,39 +1,29 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\" -AM_LDFLAGS = $(xineplug_ldflags) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"$(w32_path)\" +AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = wine DirectShow dmo qtx -if HAVE_W32DLL -w32dll_codec = xineplug_decode_w32dll.la -qt_codec = xineplug_decode_qt.la -endif +EXTRA_DIST = common.c -xineplug_LTLIBRARIES = $(w32dll_codec) $(qt_codec) +noinst_HEADERS = libwin32.h w32codec.h -EXTRA_DIST = common.c +if HAVE_W32DLL +xineplug_LTLIBRARIES = xineplug_decode_w32dll.la xineplug_decode_qt.la +endif xineplug_decode_w32dll_la_SOURCES = w32codec.c -xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_decode_w32dll_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_decode_w32dll_la_LIBADD = \ $(top_builddir)/src/libw32dll/wine/libwine.la \ - $(XINE_LIB) \ - $(PTHREAD_LIBS) \ - -lm \ $(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \ $(top_builddir)/src/libw32dll/dmo/libdmo_filter.la \ - @KSTAT_LIBS@ \ - $(XDG_BASEDIR_LIBS) + $(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS) $(XDG_BASEDIR_LIBS) +xineplug_decode_w32dll_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_decode_qt_la_SOURCES = qt_decoder.c xineplug_decode_qt_la_LIBADD = \ $(top_builddir)/src/libw32dll/wine/libwine.la \ - $(XINE_LIB) \ - $(PTHREAD_LIBS) \ - -lm \ - @KSTAT_LIBS@ - -noinst_HEADERS = libwin32.h w32codec.h + $(XINE_LIB) $(PTHREAD_LIBS) -lm $(KSTAT_LIBS) diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am index 2b7cd3e37..663e179a9 100644 --- a/src/libw32dll/dmo/Makefile.am +++ b/src/libw32dll/dmo/Makefile.am @@ -1,27 +1,24 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ - -Wmissing-prototypes -Wimplicit-function-declaration \ - -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \ +AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS \ -I$(srcdir)/.. -I$(srcdir)/../wine + +noinst_HEADERS = \ + DMO_AudioDecoder.h \ + dmo_guids.h \ + dmo_interfaces.h \ + DMO_Filter.h \ + dmo.h \ + DMO_VideoDecoder.h if HAVE_W32DLL -dmo_filter_lib = libdmo_filter.la +noinst_LTLIBRARIES = libdmo_filter.la endif -noinst_LTLIBRARIES = $(dmo_filter_lib) - libdmo_filter_la_SOURCES = \ buffer.c \ DMO_AudioDecoder.c \ dmo.c \ dmo_guids.c \ DMO_VideoDecoder.c - -noinst_HEADERS = \ - DMO_AudioDecoder.h \ - dmo_guids.h \ - dmo_interfaces.h \ - DMO_Filter.h \ - dmo.h \ - DMO_VideoDecoder.h diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 05f15f908..b9a28a151 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -1,37 +1,13 @@ include $(top_srcdir)/misc/Makefile.common -EXTRA_DIST = stubs.s wrapper.S - -noinst_LTLIBRARIES = $(wine_lib) - # disable -fomit-frame-pointer, -finline-functions, and -frename-registers # because they cause bad behavior of wine -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) @W32_NO_OPTIMIZE@ \ -fno-omit-frame-pointer -fno-inline-functions -fno-rename-registers -AM_CPPFLAGS = -DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \ +AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -I$(srcdir)/.. -D__WINE__ \ -Ddbg_printf=__vprintf -DTRACE=__vprintf - -if HAVE_W32DLL -wine_lib = libwine.la -endif - -libwine_la_SOURCES = \ - afl.c \ - driver.c \ - elfdll.c \ - ext.c \ - ldt_keeper.c \ - module.c \ - pe_image.c \ - pe_resource.c \ - resource.c \ - registry.c \ - vfl.c \ - win32.c \ - stubs.s \ - wrapper.S -libwine_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) +EXTRA_DIST = stubs.s wrapper.S noinst_HEADERS = \ avifmt.h \ @@ -71,3 +47,23 @@ noinst_HEADERS = \ winuser.h \ wrapper.h +if HAVE_W32DLL +noinst_LTLIBRARIES = libwine.la +endif + +libwine_la_SOURCES = \ + afl.c \ + driver.c \ + elfdll.c \ + ext.c \ + ldt_keeper.c \ + module.c \ + pe_image.c \ + pe_resource.c \ + resource.c \ + registry.c \ + vfl.c \ + win32.c \ + stubs.s \ + wrapper.S +libwine_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) -- cgit v1.2.3 From aa6b402b7a240b6f55c063b021c5c211f46ec8bd Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Sat, 12 May 2007 14:18:38 -0400 Subject: More configure/Makefile cleanups -- Make a pass at cleaning up contrib/ Makefile.am files -- Rename many AM_CONDITIONALS for consistency and give them better names to better indicate what they mean -- Remove some dead input plugin tests -- Clean up AM_PATH_DVDNAV --- src/libw32dll/DirectShow/Makefile.am | 2 -- src/libw32dll/Makefile.am | 7 +++++-- src/libw32dll/dmo/Makefile.am | 2 -- src/libw32dll/wine/Makefile.am | 2 -- 4 files changed, 5 insertions(+), 8 deletions(-) (limited to 'src/libw32dll') diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am index 414e6764f..02eddc00a 100644 --- a/src/libw32dll/DirectShow/Makefile.am +++ b/src/libw32dll/DirectShow/Makefile.am @@ -16,9 +16,7 @@ noinst_HEADERS = \ DS_Filter.h \ DS_VideoDecoder.h -if HAVE_W32DLL noinst_LTLIBRARIES = libds_filter.la -endif libds_filter_la_SOURCES = \ allocator.c \ diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 94dae4ab9..7d11bb2dc 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -4,13 +4,16 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"$(w32_path)\" AM_LDFLAGS = $(xineplug_ldflags) -SUBDIRS = wine DirectShow dmo qtx +SUBDIRS = +if ENABLE_W32DLL +SUBDIRS += wine DirectShow dmo qtx +endif EXTRA_DIST = common.c noinst_HEADERS = libwin32.h w32codec.h -if HAVE_W32DLL +if ENABLE_W32DLL xineplug_LTLIBRARIES = xineplug_decode_w32dll.la xineplug_decode_qt.la endif diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am index 663e179a9..56bfc8f34 100644 --- a/src/libw32dll/dmo/Makefile.am +++ b/src/libw32dll/dmo/Makefile.am @@ -12,9 +12,7 @@ noinst_HEADERS = \ dmo.h \ DMO_VideoDecoder.h -if HAVE_W32DLL noinst_LTLIBRARIES = libdmo_filter.la -endif libdmo_filter_la_SOURCES = \ buffer.c \ diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index b9a28a151..1756e3262 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -47,9 +47,7 @@ noinst_HEADERS = \ winuser.h \ wrapper.h -if HAVE_W32DLL noinst_LTLIBRARIES = libwine.la -endif libwine_la_SOURCES = \ afl.c \ -- cgit v1.2.3 From 379cc3bc5b9230d503b90c6bba58a89c8c515e06 Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Tue, 15 May 2007 14:48:19 -0400 Subject: Remove a stray trailing backslash --- src/libw32dll/dmo/Makefile.am | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/libw32dll') diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am index 56bfc8f34..531a4559a 100644 --- a/src/libw32dll/dmo/Makefile.am +++ b/src/libw32dll/dmo/Makefile.am @@ -1,8 +1,7 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ -AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS \ - -I$(srcdir)/.. -I$(srcdir)/../wine +AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer +AM_CPPFLAGS = -DWIN32_PATH=\"$(w32_path)\" -DNOAVIFILE_HEADERS -I$(srcdir)/.. -I$(srcdir)/../wine noinst_HEADERS = \ DMO_AudioDecoder.h \ -- cgit v1.2.3