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/input/vcd/Makefile.am | 6 ++++-- src/input/vcd/libcdio/Makefile.am | 5 +++-- src/input/vcd/libvcd/Makefile.am | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 16eece779..014d28679 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) +AM_LDFLAGS = $(xineplug_ldflags) + SUBDIRS = libcdio libvcd vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c @@ -9,10 +12,9 @@ EXTRA_DIST = $(vcd_SRCS) if ENABLE_VCD xineplug_LTLIBRARIES = xineplug_inp_vcd.la -AM_CFLAGS = $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) +AM_CFLAGS += $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) xineplug_inp_vcd_la_SOURCES = $(vcd_SRCS) -xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module if HAVE_VCDNAV xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS) else diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am index c7415e787..0c6b26dac 100644 --- a/src/input/vcd/libcdio/Makefile.am +++ b/src/input/vcd/libcdio/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_LDFLAGS = $(xineplug_ldflags) + SUBDIRS = cdio MSWindows image INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib @@ -54,9 +57,7 @@ if HAVE_VCDNAV else noinst_LTLIBRARIES = libcdio.la libiso9660.la libcdio_la_SOURCES = $(libcdio_SRCS) -libcdio_la_LDFLAGS = -avoid-version -module libiso9660_la_SOURCES = $(libiso9660_SRCS) -libiso9660_la_LDFLAGS = -avoid-version -module endif endif diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am index 01b100aa4..cba784d26 100644 --- a/src/input/vcd/libvcd/Makefile.am +++ b/src/input/vcd/libvcd/Makefile.am @@ -1,5 +1,8 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_LDFLAGS = $(xineplug_ldflags) + SUBDIRS = libvcd INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib @@ -36,10 +39,8 @@ if HAVE_VCDNAV else noinst_LTLIBRARIES = libvcd.la libvcdinfo.la libvcd_la_SOURCES = $(libvcd_SRCS) -libvcd_la_LDFLAGS = -avoid-version -module libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS) libvcdinfo_la_SOURCES = $(libvcdinfo_SRCS) -libvcdinfo_la_LDFLAGS = -avoid-version -module endif endif -- 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/input/vcd/Makefile.am | 19 +++++------ src/input/vcd/libcdio/Makefile.am | 37 +++++++++------------- src/input/vcd/libvcd/Makefile.am | 66 +++++++++++++++++---------------------- 3 files changed, 49 insertions(+), 73 deletions(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 014d28679..28f6290fd 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -1,26 +1,21 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) AM_LDFLAGS = $(xineplug_ldflags) -SUBDIRS = libcdio libvcd - -vcd_SRCS = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c +SUBDIRS = +if !HAVE_VCDNAV +SUBDIRS += libcdio libvcd +endif -EXTRA_DIST = $(vcd_SRCS) +noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h -if ENABLE_VCD xineplug_LTLIBRARIES = xineplug_inp_vcd.la -AM_CFLAGS += $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) +xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c -xineplug_inp_vcd_la_SOURCES = $(vcd_SRCS) if HAVE_VCDNAV xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS) else xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm endif - -endif - -noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am index 0c6b26dac..6414d8230 100644 --- a/src/input/vcd/libcdio/Makefile.am +++ b/src/input/vcd/libcdio/Makefile.am @@ -1,13 +1,24 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = cdio MSWindows image INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib -libcdio_SRCS = \ +noinst_HEADERS = \ + cdio_assert.h \ + _cdio_stdio.h \ + scsi_mmc.h \ + cdio_private.h \ + _cdio_stream.h \ + iso9660_private.h \ + portable.h + +noinst_LTLIBRARIES = libcdio.la libiso9660.la + +libcdio_la_SOURCES = \ _cdio_bsdi.c \ _cdio_generic.c \ _cdio_linux.c \ @@ -44,28 +55,8 @@ libcdio_SRCS = \ sector.c \ util.c -libiso9660_SRCS = \ +libiso9660_la_SOURCES = \ iso9660.c \ iso9660_private.h \ iso9660_fs.c \ xa.c - -EXTRA_DIST = $(libcdio_SRCS) $(libiso9660_SRCS) - -if ENABLE_VCD -if HAVE_VCDNAV -else -noinst_LTLIBRARIES = libcdio.la libiso9660.la -libcdio_la_SOURCES = $(libcdio_SRCS) -libiso9660_la_SOURCES = $(libiso9660_SRCS) -endif -endif - -noinst_HEADERS = \ - cdio_assert.h \ - _cdio_stdio.h \ - scsi_mmc.h \ - cdio_private.h \ - _cdio_stream.h \ - iso9660_private.h \ - portable.h diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am index cba784d26..65ffc6255 100644 --- a/src/input/vcd/libvcd/Makefile.am +++ b/src/input/vcd/libvcd/Makefile.am @@ -1,13 +1,35 @@ include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) -AM_LDFLAGS = $(xineplug_ldflags) + +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib SUBDIRS = libvcd -INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib +noinst_HEADERS = \ + vcd_assert.h \ + data_structures.h \ + info_private.h \ + pbc.h \ + stream_stdio.h \ + bitvec.h \ + dict.h \ + mpeg.h \ + salloc.h \ + util.h \ + bytesex_asm.h \ + directory.h \ + mpeg_stream.h \ + sector_private.h \ + vcd.h \ + bytesex.h \ + image_sink.h \ + obj.h \ + stream.h \ + vcd_read.h -libvcd_SRCS = \ +noinst_LTLIBRARIES = libvcd.la libvcdinfo.la +libvcd_la_SOURCES = \ vcd.c \ data_structures.c \ directory.c \ @@ -25,43 +47,11 @@ libvcd_SRCS = \ stream.c \ stream_stdio.c \ util.c +libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS) +libvcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) -libvcdinfo_SRCS = \ +libvcdinfo_la_SOURCES = \ info.c \ inf.c \ info_private.c \ vcd_read.c - -EXTRA_DIST = $(libvcd_SRCS) $(libvcdinfo_SRCS) - -if ENABLE_VCD -if HAVE_VCDNAV -else -noinst_LTLIBRARIES = libvcd.la libvcdinfo.la -libvcd_la_SOURCES = $(libvcd_SRCS) -libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS) -libvcdinfo_la_SOURCES = $(libvcdinfo_SRCS) -endif -endif - -noinst_HEADERS = \ - vcd_assert.h \ - data_structures.h \ - info_private.h \ - pbc.h \ - stream_stdio.h \ - bitvec.h \ - dict.h \ - mpeg.h \ - salloc.h \ - util.h \ - bytesex_asm.h \ - directory.h \ - mpeg_stream.h \ - sector_private.h \ - vcd.h \ - bytesex.h \ - image_sink.h \ - obj.h \ - stream.h \ - vcd_read.h -- 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/input/vcd/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 28f6290fd..0ff664605 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -4,7 +4,7 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = -if !HAVE_VCDNAV +if !WITH_EXTERNAL_VCDLIBS SUBDIRS += libcdio libvcd endif @@ -14,7 +14,7 @@ xineplug_LTLIBRARIES = xineplug_inp_vcd.la xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c -if HAVE_VCDNAV +if WITH_EXTERNAL_VCDLIBS xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS) else xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm -- cgit v1.2.3 From 0f8df48c99c5ba5bc6b27e07a85df183400e9410 Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Mon, 14 May 2007 20:08:12 -0400 Subject: Final pass over input plugin configuration checks -- Move some generic checks out of m4/input.m4 and back into configure.ac -- Remove ioctl_request.m4 and inline it in configure.ac -- Fix compilation of internal libcdio and libvcd stuff -- now works for Darwin -- Add a switch for enabling/disabling dvb support. Disabled by default for all platforms except for Linux. Only allowed to be used on Linux. -- Disable vcd support on all platforms except for FreeBSD, Linux, and Solaris, because src/input/input_vcd.c is only supported on those platforms even though libcdio and libvcd will compile on other platforms -- Clean up some summary.m4 stuff --- src/input/vcd/Makefile.am | 8 ++------ src/input/vcd/libcdio/Makefile.am | 4 ++-- src/input/vcd/libvcd/Makefile.am | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 0ff664605..1f03720cb 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = @@ -13,9 +13,5 @@ noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h xineplug_LTLIBRARIES = xineplug_inp_vcd.la xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c - -if WITH_EXTERNAL_VCDLIBS -xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS) -else xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm -endif +xineplug_inp_vcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am index 6414d8230..a79525c8f 100644 --- a/src/input/vcd/libcdio/Makefile.am +++ b/src/input/vcd/libcdio/Makefile.am @@ -1,11 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = cdio MSWindows image -INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib +INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib noinst_HEADERS = \ cdio_assert.h \ diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am index 65ffc6255..c922685e3 100644 --- a/src/input/vcd/libvcd/Makefile.am +++ b/src/input/vcd/libvcd/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/lib -I$(top_builddir)/lib SUBDIRS = libvcd @@ -47,7 +47,6 @@ libvcd_la_SOURCES = \ stream.c \ stream_stdio.c \ util.c -libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS) libvcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) libvcdinfo_la_SOURCES = \ @@ -55,3 +54,4 @@ libvcdinfo_la_SOURCES = \ inf.c \ info_private.c \ vcd_read.c +libvcdinfo_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) -- cgit v1.2.3 From 5da77351d0e7edf28d5f6118207df609f52abd06 Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Thu, 17 May 2007 17:21:18 -0400 Subject: Add missing LIBCDIO_LIBS to the list of linked libraries --- src/input/vcd/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 1f03720cb..873f1d54a 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -13,5 +13,5 @@ noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h xineplug_LTLIBRARIES = xineplug_inp_vcd.la xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c -xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm +xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm xineplug_inp_vcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) -- cgit v1.2.3 From adebccc0fc011b6d1abe2f682bbfc866dffee73e Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 31 May 2007 02:28:46 +0100 Subject: Link libiso9660 into the vcd plugin. Fixes a run-time symbol lookup failure. --- src/input/vcd/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/vcd') diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am index 873f1d54a..3de899f7e 100644 --- a/src/input/vcd/Makefile.am +++ b/src/input/vcd/Makefile.am @@ -13,5 +13,5 @@ noinst_HEADERS = vcdio.h vcdplayer.h xine-extra.h xineplug_LTLIBRARIES = xineplug_inp_vcd.la xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c -xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm +xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBCDIO_LIBS) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) $(LIBISO9660_LIBS) -lm xineplug_inp_vcd_la_CFLAGS = $(AM_CFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS) -- cgit v1.2.3