From 9caa2fc3aaa8e7160b5cbee6d56679ae9451a386 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 21 Jan 2010 19:04:22 +0000 Subject: Create libxine-interface.la and make libxine.la weakly provide it. This reduces requirements of plugins etc., hopefully where possible and without breakage. (Works on Linux.) --- misc/Makefile.common | 6 ++++-- src/xine-engine/Makefile.am | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/misc/Makefile.common b/misc/Makefile.common index 7c53f329b..8ca823169 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -8,8 +8,10 @@ xineplug_ldflags = $(LDFLAGS_NOUNDEFINED) $(GCSECTIONS) -avoid-version -module xinepostdir = $(XINE_PLUGINDIR)/post vidixdir = $(XINE_PLUGINDIR)/vidix -$(XINE_LIB): - $(MAKE) -C $(top_builddir)/src/xine-engine +$(XINE_LIB): $(top_builddir)/src/xine-engine/libxine-interface.la + +$(top_builddir)/src/xine-engine/libxine-interface.la: + $(MAKE) -C $(top_builddir)/src/xine-engine libxine-interface.la $(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la: $(MAKE) -C $(top_builddir)/contrib/libxdg-basedir diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index e32f2d2f4..e5aefa8da 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -13,11 +13,14 @@ EXTRA_DIST = lrb.c lrb.h accel_xvmc.h if WIN32 DEF_FILE = libxine-$(XINE_MAJOR).def def_ldflags="-Wl,--output-def,$(DEF_FILE)" +else +DEF_FILE = endif noinst_HEADERS = bswap.h ffmpeg_bswap.h lib_LTLIBRARIES = libxine.la +noinst_LTLBRARIES = libxine-interface.la libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ load_plugins.c video_decoder.c buffer_types.c \ @@ -36,15 +39,25 @@ libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) $(AVUTIL_LIBS) libxine_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) $(GCSECTIONS) \ + -weak libxine-interface.la \ -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) +libxine-interface.la: libxine.la + sed -e "/^dependency_libs/ s/'.*'/''/" <$< >$@ + +install-exec-hook: libxine-interface.la + $(INSTALL_DATA) "$(builddir)"/libxine-interface.la "$(DESTDIR)$(libdir)"/libxine-interface.la + +clean-local: + rm -f "$(builddir)"/libxine-interface.la + $(XINEUTILS_LIB): $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la if WIN32 install-exec-local: cp -p $(DEF_FILE) $(DESTDIR)$(libdir) +endif uninstall-local: - rm -f $(DEF_FILE) -endif + rm -f $(DEF_FILE) "$(DESTDIR)$(libdir)"/libxine-interface.la -- cgit v1.2.3