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/liba52/Makefile.am | 28 +++++----- src/libfaad/Makefile.am | 102 +++++++++++++++++------------------ src/libmad/Makefile.am | 57 +++++++++----------- src/libmpeg2/Makefile.am | 8 +-- src/libmpeg2new/Makefile.am | 8 ++- src/libmpeg2new/libmpeg2/Makefile.am | 3 +- src/libreal/Makefile.am | 6 +-- src/libspucc/Makefile.am | 8 +-- src/libspucmml/Makefile.am | 2 +- src/libspudec/Makefile.am | 29 ++++------ src/libspudvb/Makefile.am | 2 +- src/libsputext/Makefile.am | 2 +- src/libw32dll/DirectShow/Makefile.am | 33 ++++++------ src/libw32dll/Makefile.am | 32 ++++------- src/libw32dll/dmo/Makefile.am | 23 ++++---- src/libw32dll/wine/Makefile.am | 50 ++++++++--------- src/libxineadec/Makefile.am | 14 ++--- src/libxinevdec/Makefile.am | 8 +-- 18 files changed, 186 insertions(+), 229 deletions(-) diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 948a7ab28..9eec4f6d2 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,16 +1,22 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) +noinst_HEADERS = \ + a52.h \ + a52_internal.h \ + bitstream.h \ + tables.h \ + crc.c + if A52 -a52_module = xineplug_decode_a52.la +xineplug_LTLIBRARIES = xineplug_decode_a52.la endif -xineplug_LTLIBRARIES = $(a52_module) - if EXTERNAL_A52DEC internal_sources = +external_libs = -la52 else internal_sources = \ bitstream.c \ @@ -18,21 +24,11 @@ internal_sources = \ downmix.c \ imdct.c \ parse.c +external_libs = endif xineplug_decode_a52_la_SOURCES = \ xine_a52_decoder.c \ $(internal_sources) -if EXTERNAL_A52DEC -xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -lm -else -xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -lm -endif - -noinst_HEADERS = \ - a52.h \ - a52_internal.h \ - bitstream.h \ - tables.h \ - crc.c +xineplug_decode_a52_la_LIBADD = $(XINE_LIB) $(external_libs) -lm diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index c02810f00..5f4be9cd4 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -1,61 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) -SUBDIRS = codebook - -if BUILD_FAAD -faad_module = xineplug_decode_faad.la -endif - -xineplug_LTLIBRARIES = $(faad_module) - VPATH = @srcdir@:@srcdir@/codebook: -xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing -xineplug_decode_faad_la_SOURCES = \ - bits.c \ - cfft.c \ - common.c \ - decoder.c \ - drc.c \ - drm_dec.c \ - error.c \ - filtbank.c \ - hcr.c \ - huffman.c \ - ic_predict.c \ - is.c \ - lt_predict.c \ - mdct.c \ - mp4.c \ - ms.c \ - output.c \ - pns.c \ - ps_dec.c \ - ps_syntax.c \ - pulse.c \ - rvlc.c \ - sbr_dct.c \ - sbr_dec.c \ - sbr_e_nf.c \ - sbr_fbt.c \ - sbr_hfadj.c \ - sbr_hfgen.c \ - sbr_huff.c \ - sbr_qmf.c \ - sbr_syntax.c \ - sbr_tf_grid.c \ - specrec.c \ - ssr.c \ - ssr_fb.c \ - ssr_ipqf.c \ - syntax.c \ - tns.c \ - xine_faad_decoder.c - -xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) +SUBDIRS = codebook noinst_HEADERS = \ analysis.h \ @@ -106,3 +56,51 @@ noinst_HEADERS = \ structs.h \ syntax.h \ tns.h + +if BUILD_FAAD +xineplug_LTLIBRARIES = xineplug_decode_faad.la +endif + +xineplug_decode_faad_la_SOURCES = \ + bits.c \ + cfft.c \ + common.c \ + decoder.c \ + drc.c \ + drm_dec.c \ + error.c \ + filtbank.c \ + hcr.c \ + huffman.c \ + ic_predict.c \ + is.c \ + lt_predict.c \ + mdct.c \ + mp4.c \ + ms.c \ + output.c \ + pns.c \ + ps_dec.c \ + ps_syntax.c \ + pulse.c \ + rvlc.c \ + sbr_dct.c \ + sbr_dec.c \ + sbr_e_nf.c \ + sbr_fbt.c \ + sbr_hfadj.c \ + sbr_hfgen.c \ + sbr_huff.c \ + sbr_qmf.c \ + sbr_syntax.c \ + sbr_tf_grid.c \ + specrec.c \ + ssr.c \ + ssr_fb.c \ + ssr_ipqf.c \ + syntax.c \ + tns.c \ + xine_faad_decoder.c + +xineplug_decode_faad_la_LIBADD = -lm $(XINE_LIB) +xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am index 7e8b617f4..b1e1f29f5 100644 --- a/src/libmad/Makefile.am +++ b/src/libmad/Makefile.am @@ -1,19 +1,36 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_CPPFLAGS = -DOPT_SPEED -AM_LDFLAGS = $(xineplug_ldflags) +AM_LDFLAGS = $(xineplug_ldflags) EXTRA_DIST = imdct_l_arm.S +noinst_HEADERS = \ + D.dat \ + imdct_s.dat \ + qc_table.dat \ + rq_table.dat \ + sf_table.dat \ + bit.h \ + fixed.h \ + frame.h \ + global.h \ + huffman.h \ + layer12.h \ + layer3.h \ + stream.h \ + synth.h \ + timer.h \ + version.h + if MAD -mad_module = xineplug_decode_mad.la +xineplug_LTLIBRARIES = xineplug_decode_mad.la endif -xineplug_LTLIBRARIES = $(mad_module) - if EXTERNAL_LIBMAD internal_sources = +external_libs = $(LIBMAD_LIBS) else internal_sources = \ bit.c \ @@ -26,33 +43,9 @@ internal_sources = \ synth.c \ timer.c \ version.c +external_libs = endif -xineplug_decode_mad_la_SOURCES = \ - xine_mad_decoder.c \ - $(internal_sources) - -if EXTERNAL_LIBMAD -xineplug_decode_mad_la_LIBADD = $(XINE_LIB) $(LIBMAD_LIBS) -else -xineplug_decode_mad_la_LIBADD = $(XINE_LIB) -endif +xineplug_decode_mad_la_SOURCES = xine_mad_decoder.c $(internal_sources) +xineplug_decode_mad_la_LIBADD = $(XINE_LIB) $(external_libs) xineplug_decode_mad_la_CFLAGS = $(AM_CFLAGS) $(LIBMAD_CFLAGS) - -noinst_HEADERS = \ - D.dat \ - imdct_s.dat \ - qc_table.dat \ - rq_table.dat \ - sf_table.dat \ - bit.h \ - fixed.h \ - frame.h \ - global.h \ - huffman.h \ - layer12.h \ - layer3.h \ - stream.h \ - synth.h \ - timer.h \ - version.h diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am index 6b194ebbb..a970c6d24 100644 --- a/src/libmpeg2/Makefile.am +++ b/src/libmpeg2/Makefile.am @@ -1,8 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) +noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h \ + libmpeg2_accel.h + xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la xineplug_decode_mpeg2_la_SOURCES = \ @@ -27,6 +30,3 @@ xineplug_decode_mpeg2_la_SOURCES = \ xineplug_decode_mpeg2_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(LIBMPEG2_CFLAGS) - -noinst_HEADERS = vlc.h mpeg2.h xvmc.h xvmc_vld.h mpeg2_internal.h idct_mlib.h vis.h \ - libmpeg2_accel.h diff --git a/src/libmpeg2new/Makefile.am b/src/libmpeg2new/Makefile.am index 8f8f1c940..4e9e6305b 100644 --- a/src/libmpeg2new/Makefile.am +++ b/src/libmpeg2new/Makefile.am @@ -1,14 +1,12 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = libmpeg2 xineplug_LTLIBRARIES = xineplug_decode_mpeg2.la -xineplug_decode_mpeg2_la_SOURCES = \ - xine_mpeg2_decoder.c - -xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(LIBMPEG2_CFLAGS) +xineplug_decode_mpeg2_la_SOURCES = xine_mpeg2_decoder.c xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) ./libmpeg2/libmpeg2.la +xineplug_decode_mpeg2_la_CFLAGS = $(AM_CFLAGS) $(LIBMPEG2_CFLAGS) diff --git a/src/libmpeg2new/libmpeg2/Makefile.am b/src/libmpeg2new/libmpeg2/Makefile.am index 83ae1c32f..2caa3ddc2 100644 --- a/src/libmpeg2new/libmpeg2/Makefile.am +++ b/src/libmpeg2new/libmpeg2/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) noinst_LTLIBRARIES = libmpeg2.la libmpeg2arch.la @@ -12,4 +12,3 @@ libmpeg2arch_la_SOURCES = motion_comp_mmx.c idct_mmx.c \ motion_comp_alpha.c idct_alpha.c \ motion_comp_vis.c \ cpu_accel.c cpu_state.c - diff --git a/src/libreal/Makefile.am b/src/libreal/Makefile.am index 28d85fe45..0f765394e 100644 --- a/src/libreal/Makefile.am +++ b/src/libreal/Makefile.am @@ -1,13 +1,13 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) +noinst_HEADERS = real_common.h + if ENABLE_REAL xineplug_LTLIBRARIES = xineplug_decode_real.la endif xineplug_decode_real_la_SOURCES = xine_real_video_decoder.c real_common.c xine_real_audio_decoder.c xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) - -noinst_HEADERS = real_common.h diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am index c32e7a292..87266505c 100644 --- a/src/libspucc/Makefile.am +++ b/src/libspucc/Makefile.am @@ -1,12 +1,12 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) +noinst_HEADERS = cc_decoder.h + xineplug_LTLIBRARIES = xineplug_decode_spucc.la xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_cc_decoder.c -xineplug_decode_spucc_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing xineplug_decode_spucc_la_LIBADD = $(XINE_LIB) - -noinst_HEADERS = cc_decoder.h +xineplug_decode_spucc_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing diff --git a/src/libspucmml/Makefile.am b/src/libspucmml/Makefile.am index 95b611008..fb92ff589 100644 --- a/src/libspucmml/Makefile.am +++ b/src/libspucmml/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) xineplug_LTLIBRARIES = xineplug_decode_spucmml.la diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am index d159728fc..13d5da6f5 100644 --- a/src/libspudec/Makefile.am +++ b/src/libspudec/Makefile.am @@ -1,28 +1,21 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav -AM_LDFLAGS = $(xineplug_ldflags) +AM_LDFLAGS = $(xineplug_ldflags) + +noinst_HEADERS = spu.h xineplug_LTLIBRARIES = xineplug_decode_spu.la if HAVE_DVDNAV - -xineplug_decode_spu_la_SOURCES = \ - spu.c \ - xine_spu_decoder.c -xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS) $(PTHREAD_LIBS) - +external_dvdnav_libs = $(DVDNAV_LIBS) +internal_dvdnav_sources = else - -xineplug_decode_spu_la_SOURCES = \ - nav_read.c \ - spu.c \ - xine_spu_decoder.c -xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) - +external_dvdnav_libs = +internal_dvdnav_sources = nav_read.c endif -xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) - -noinst_HEADERS = spu.h +xineplug_decode_spu_la_SOURCES = $(internal_dvdnav_sources) spu.c xine_spu_decoder.c +xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(external_dvdnav_libs) $(PTHREAD_LIBS) +xineplug_decode_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS) diff --git a/src/libspudvb/Makefile.am b/src/libspudvb/Makefile.am index f4248909f..f822df0d9 100644 --- a/src/libspudvb/Makefile.am +++ b/src/libspudvb/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) xineplug_LTLIBRARIES = xineplug_decode_spudvb.la diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am index 71af2a1d3..f09219043 100644 --- a/src/libsputext/Makefile.am +++ b/src/libsputext/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) xineplug_LTLIBRARIES = xineplug_decode_sputext.la xineplug_dmx_sputext.la 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) diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index 0d209be43..e65024184 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -1,11 +1,11 @@ include $(top_srcdir)/misc/Makefile.common -EXTRA_DIST = fooaudio.c +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) SUBDIRS = gsm610 nosefart -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -AM_LDFLAGS = $(xineplug_ldflags) +EXTRA_DIST = fooaudio.c if HAVE_VORBIS vorbis_module = xineplug_decode_vorbis.la @@ -42,9 +42,9 @@ xineplug_decode_gsm610_la_SOURCES = gsm610.c xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la xineplug_decode_nsf_la_SOURCES = nsf.c -xineplug_decode_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing -xineplug_decode_nsf_la_CPPFLAGS = -DNSF_PLAYER xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) -lm nosefart/libnosefart.la +xineplug_decode_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing +xineplug_decode_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB) @@ -58,11 +58,11 @@ xineplug_decode_speex_la_LIBADD = $(XINE_LIB) $(SPEEX_LIBS) xineplug_decode_speex_la_CFLAGS = $(AM_CFLAGS) $(SPEEX_CFLAGS) xineplug_decode_mpc_la_SOURCES = xine_musepack_decoder.c -xineplug_decode_mpc_la_CFLAGS = $(AM_CFLAGS) $(MPCDEC_CFLAGS) xineplug_decode_mpc_la_DEPENDENCIES = $(MPCDEC_DEPS) xineplug_decode_mpc_la_LIBADD = $(XINE_LIB) $(MPCDEC_LIBS) +xineplug_decode_mpc_la_CFLAGS = $(AM_CFLAGS) $(MPCDEC_CFLAGS) xineplug_decode_dts_la_SOURCES = xine_dts_decoder.c -xineplug_decode_dts_la_CFLAGS = $(AM_CFLAGS) $(LIBDTS_CFLAGS) xineplug_decode_dts_la_DEPENDENCIES = $(LIBDTS_DEPS) xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS) +xineplug_decode_dts_la_CFLAGS = $(AM_CFLAGS) $(LIBDTS_CFLAGS) diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index 728991a96..2902d23b3 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) AM_LDFLAGS = $(xineplug_ldflags) EXTRA_DIST = foovideo.c @@ -34,13 +34,13 @@ xineplug_decode_yuv_la_SOURCES = yuv.c xineplug_decode_yuv_la_LIBADD = $(XINE_LIB) xineplug_decode_image_la_SOURCES = image.c -xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS) xineplug_decode_image_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(WAND_LIBS) +xineplug_decode_image_la_CFLAGS = $(AM_CFLAGS) $(WAND_CFLAGS) xineplug_decode_gdk_pixbuf_la_SOURCES = gdkpixbuf.c -xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) xineplug_decode_gdk_pixbuf_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(GDK_PIXBUF_LIBS) +xineplug_decode_gdk_pixbuf_la_CFLAGS = $(AM_CFLAGS) $(GDK_PIXBUF_CFLAGS) xineplug_decode_theora_la_SOURCES = xine_theora_decoder.c -xineplug_decode_theora_la_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) $(THEORA_CFLAGS) xineplug_decode_theora_la_LIBADD = $(XINE_LIB) $(OGG_LIBS) $(THEORA_LIBS) +xineplug_decode_theora_la_CFLAGS = $(AM_CFLAGS) $(OGG_CFLAGS) $(THEORA_CFLAGS) -- cgit v1.2.3