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/Makefile.am | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) (limited to 'src/input/Makefile.am') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index ae38de187..ce8c2fe33 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -1,5 +1,11 @@ include $(top_srcdir)/misc/Makefile.common +# REVISIT: This second line here bothers me more than just a little bit +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) \ + $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS) +AM_CPPFLAGS = -D_LARGEFILE64_SOURCE +AM_LDFLAGS = $(xineplug_ldflags) + EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c if HAVE_DVDNAV @@ -48,7 +54,6 @@ in_rtp = xineplug_inp_rtp.la in_dvb = xineplug_inp_dvb.la endif -AM_CFLAGS = -D_LARGEFILE64_SOURCE $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS) xineplug_LTLIBRARIES = \ xineplug_inp_file.la \ @@ -71,85 +76,55 @@ xineplug_LTLIBRARIES = \ xineplug_inp_file_la_SOURCES = input_file.c xineplug_inp_file_la_LIBADD = $(XINE_LIB) -xineplug_inp_file_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_file_la_LDFLAGS = -avoid-version -module xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) -xineplug_inp_dvd_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_dvd_la_LDFLAGS = -avoid-version -module xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS) -xineplug_inp_net_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_net_la_LDFLAGS = -avoid-version -module xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c mmsh.c http_helper.c ../demuxers/asfheader.c xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@ $(PTHREAD_LIBS) -xineplug_inp_mms_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_mms_la_LDFLAGS = -avoid-version -module xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB) -xineplug_inp_vcdo_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_vcdo_la_LDFLAGS = -avoid-version -module xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_inp_stdin_fifo_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_stdin_fifo_la_LDFLAGS = -avoid-version -module xineplug_inp_rtp_la_SOURCES = input_rtp.c net_buf_ctrl.c xineplug_inp_rtp_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS) -xineplug_inp_rtp_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_rtp_la_LDFLAGS = -avoid-version -module xineplug_inp_http_la_SOURCES = input_http.c net_buf_ctrl.c http_helper.c xineplug_inp_http_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS) -xineplug_inp_http_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_http_la_LDFLAGS = -avoid-version -module xineplug_inp_pnm_la_SOURCES = input_pnm.c net_buf_ctrl.c pnm.c xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_inp_pnm_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_pnm_la_LDFLAGS = -avoid-version -module xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c xineplug_inp_dvb_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(XDG_BASEDIR_LIBS) -xineplug_inp_dvb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) -xineplug_inp_dvb_la_LDFLAGS = -avoid-version -module +xineplug_inp_dvb_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) libreal/libreal.la librtsp/librtsp.la -xineplug_inp_rtsp_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_rtsp_la_LDFLAGS = -avoid-version -module xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(XDG_BASEDIR_LIBS) -xineplug_inp_cdda_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) -xineplug_inp_cdda_la_LDFLAGS = -avoid-version -module +xineplug_inp_cdda_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) xineplug_inp_v4l_la_SOURCES = input_v4l.c xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) -xineplug_inp_v4l_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_inp_gnome_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_gnome_vfs_la_LDFLAGS = -avoid-version -module xineplug_inp_smb_la_SOURCES = input_smb.c xineplug_inp_smb_la_LIBADD = $(LIBSMBCLIENT_LIBS) $(XINE_LIB) -xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_smb_la_LDFLAGS = -avoid-version -module xineplug_inp_pvr_la_SOURCES = input_pvr.c xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_inp_pvr_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -xineplug_inp_pvr_la_LDFLAGS = -avoid-version -module xineinclude_HEADERS = input_plugin.h noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h -- 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/input/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/input/Makefile.am') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index ce8c2fe33..e5b6926dc 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -104,7 +104,7 @@ xineplug_inp_pnm_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) xineplug_inp_dvb_la_SOURCES = input_dvb.c net_buf_ctrl.c xineplug_inp_dvb_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_inp_dvb_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(XDG_BASEDIR_LIBS) -xineplug_inp_dvb_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) +xineplug_inp_dvb_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_inp_rtsp_la_SOURCES = input_rtsp.c net_buf_ctrl.c xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) libreal/libreal.la librtsp/librtsp.la @@ -112,7 +112,7 @@ xineplug_inp_rtsp_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) libreal/libreal.la lib xineplug_inp_cdda_la_SOURCES = input_cdda.c media_helper.c sha1.c sha1.h base64.c base64.h xineplug_inp_cdda_la_DEPS = $(XDG_BASEDIR_DEPS) xineplug_inp_cdda_la_LIBADD = $(XINE_LIB) $(XDG_BASEDIR_LIBS) -xineplug_inp_cdda_la_CFLAGS = $(AM_CFLAGS) $(XDG_BASEDIR_CFLAGS) +xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_inp_v4l_la_SOURCES = input_v4l.c xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) -- cgit v1.2.3 From 68a59d5714f4cf1ac536d347c879995fb4685475 Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Thu, 10 May 2007 14:16:59 -0400 Subject: Remove -D_LARGEFILE64_SOURCE from AM_CPPFLAGS This is a transitional macro that's normally defined by the system includes if _GNU_SOURCE is defined, which it will be because of AC_GNU_SOURCE. It's only used by GNU libc. I cannot find anything in any of the code built by these Makefiles that uses any of the types, structures, or functions that defining this macro produces. --- src/input/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'src/input/Makefile.am') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index e5b6926dc..e4b46637e 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -3,7 +3,6 @@ include $(top_srcdir)/misc/Makefile.common # REVISIT: This second line here bothers me more than just a little bit AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) \ $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS) -AM_CPPFLAGS = -D_LARGEFILE64_SOURCE AM_LDFLAGS = $(xineplug_ldflags) EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.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/input/Makefile.am | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/input/Makefile.am') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index e4b46637e..b5aa3f902 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -1,25 +1,29 @@ include $(top_srcdir)/misc/Makefile.common # REVISIT: This second line here bothers me more than just a little bit -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) \ - $(GNOME_VFS_CFLAGS) $(ALSA_CFLAGS) $(DVD_CFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) -EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c - -if HAVE_DVDNAV -SUBDIRS = vcd dvb libreal librtsp -else -SUBDIRS = vcd dvb libreal librtsp libdvdnav -endif - ## # IMPORTANT: # --------- # All of xine input plugins should be named like the scheme "xineplug_inp_" # -if HAVE_CDROM_IOCTLS +SUBDIRS = dvb libreal librtsp +if ENABLE_VCD +SUBDIRS += vcd +endif +if !HAVE_DVDNAV +SUBDIRS += libdvdnav +endif + + +xineinclude_HEADERS = input_plugin.h +noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h + + +if ENABLE_VCD in_vcd = xineplug_inp_vcdo.la endif @@ -36,19 +40,16 @@ if HAVE_LIBSMBCLIENT in_smb = xineplug_inp_smb.la endif -# For DVD -in_dvd = xineplug_inp_dvd.la if HAVE_DVDNAV -DVD_CFLAGS = $(DVDNAV_CFLAGS) +DVD_CFLAGS = $(DVDNAV_CFLAGS) link_dvdnav = $(DVDNAV_LIBS) else -DVD_CFLAGS = -I$(top_srcdir)/src/input/libdvdnav/ +DVD_CFLAGS = -I$(top_srcdir)/src/input/libdvdnav link_dvdnav = libdvdnav/libdvdnav.la endif # not ported to native Windows -if WIN32 -else +if !WIN32 in_rtp = xineplug_inp_rtp.la in_dvb = xineplug_inp_dvb.la endif @@ -57,7 +58,7 @@ endif xineplug_LTLIBRARIES = \ xineplug_inp_file.la \ xineplug_inp_http.la \ - $(in_dvd) \ + xineplug_inp_dvd.la \ $(in_vcd) \ $(in_v4l) \ $(in_gnome_vfs) \ @@ -78,6 +79,7 @@ xineplug_inp_file_la_LIBADD = $(XINE_LIB) xineplug_inp_dvd_la_SOURCES = input_dvd.c media_helper.c xineplug_inp_dvd_la_LIBADD = $(XINE_LIB) $(link_dvdnav) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) +xineplug_inp_dvd_la_CFLAGS = $(AM_CFLAGS) $(DVD_CFLAGS) xineplug_inp_net_la_SOURCES = input_net.c net_buf_ctrl.c xineplug_inp_net_la_LIBADD = $(XINE_LIB) $(NET_LIBS) $(PTHREAD_LIBS) @@ -115,16 +117,14 @@ xineplug_inp_cdda_la_CPPFLAGS = $(AM_CPPFLAGS) $(XDG_BASEDIR_CPPFLAGS) xineplug_inp_v4l_la_SOURCES = input_v4l.c xineplug_inp_v4l_la_LIBADD = $(ALSA_LIBS) $(XINE_LIB) +xineplug_inp_v4l_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS) xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c xineplug_inp_gnome_vfs_la_LIBADD = $(GNOME_VFS_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) +xineplug_inp_gnome_vfs_la_CFLAGS = $(AM_CFLAGS) $(GNOME_VFS_CFLAGS) xineplug_inp_smb_la_SOURCES = input_smb.c xineplug_inp_smb_la_LIBADD = $(LIBSMBCLIENT_LIBS) $(XINE_LIB) xineplug_inp_pvr_la_SOURCES = input_pvr.c xineplug_inp_pvr_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) - -xineinclude_HEADERS = input_plugin.h -noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.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/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/input/Makefile.am') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index b5aa3f902..a5c98c85f 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -14,7 +14,7 @@ SUBDIRS = dvb libreal librtsp if ENABLE_VCD SUBDIRS += vcd endif -if !HAVE_DVDNAV +if !WITH_EXTERNAL_DVDNAV SUBDIRS += libdvdnav endif @@ -27,20 +27,20 @@ if ENABLE_VCD in_vcd = xineplug_inp_vcdo.la endif -if HAVE_V4L +if ENABLE_V4L in_v4l = xineplug_inp_v4l.la in_pvr = xineplug_inp_pvr.la endif -if HAVE_GNOME_VFS +if ENABLE_GNOME_VFS in_gnome_vfs = xineplug_inp_gnome_vfs.la endif -if HAVE_LIBSMBCLIENT +if ENABLE_LIBSMBCLIENT in_smb = xineplug_inp_smb.la endif -if HAVE_DVDNAV +if WITH_EXTERNAL_DVDNAV DVD_CFLAGS = $(DVDNAV_CFLAGS) link_dvdnav = $(DVDNAV_LIBS) else -- 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/Makefile.am | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/input/Makefile.am') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index a5c98c85f..b1cd89bb5 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -10,7 +10,10 @@ AM_LDFLAGS = $(xineplug_ldflags) # All of xine input plugins should be named like the scheme "xineplug_inp_" # -SUBDIRS = dvb libreal librtsp +SUBDIRS = libreal librtsp +if ENABLE_DVB +SUBDIRS += dvb +endif if ENABLE_VCD SUBDIRS += vcd endif @@ -23,6 +26,10 @@ xineinclude_HEADERS = input_plugin.h noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h http_helper.h +if ENABLE_DVB +in_dvb = xineplug_inp_dvb.la +endif + if ENABLE_VCD in_vcd = xineplug_inp_vcdo.la endif @@ -51,7 +58,6 @@ endif # not ported to native Windows if !WIN32 in_rtp = xineplug_inp_rtp.la -in_dvb = xineplug_inp_dvb.la endif -- cgit v1.2.3 From e734650e1161e7cc30141f3d665ea15c015d3e87 Mon Sep 17 00:00:00 2001 From: Matt Messier Date: Sat, 19 May 2007 05:07:26 -0400 Subject: Input plugins: Enable vcd, but disable vcdo by default except on FreeBSD, Linux, and Solaris. There's no explicit option to enable or disable vcdo, and it's built if the platform supports it and vcd is enabled. --- src/input/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/input/Makefile.am') diff --git a/src/input/Makefile.am b/src/input/Makefile.am index b1cd89bb5..f9f9a9fb8 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -30,7 +30,7 @@ if ENABLE_DVB in_dvb = xineplug_inp_dvb.la endif -if ENABLE_VCD +if ENABLE_VCDO in_vcd = xineplug_inp_vcdo.la endif -- cgit v1.2.3