diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-23 17:33:24 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-23 17:33:24 +0000 |
| commit | dcc02769693d66bbb703b082c3cde9174ade4a37 (patch) | |
| tree | 0695d0c1be2b48d7cb8e562133faaa9d1ead088c | |
| parent | 0f3ef3d6c6df742251c679faad353c11576a49ac (diff) | |
| download | xine-lib-dcc02769693d66bbb703b082c3cde9174ade4a37.tar.gz xine-lib-dcc02769693d66bbb703b082c3cde9174ade4a37.tar.bz2 | |
Fix up convenience interface library building (with older build tools).
| -rw-r--r-- | misc/Makefile.common | 6 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/misc/Makefile.common b/misc/Makefile.common index 8ca823169..0202a8dea 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -8,10 +8,8 @@ xineplug_ldflags = $(LDFLAGS_NOUNDEFINED) $(GCSECTIONS) -avoid-version -module xinepostdir = $(XINE_PLUGINDIR)/post vidixdir = $(XINE_PLUGINDIR)/vidix -$(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 +$(XINE_LIB): + $(MAKE) -C $(top_builddir)/src/xine-engine libxine.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 e5aefa8da..1817fa9d6 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -20,7 +20,9 @@ endif noinst_HEADERS = bswap.h ffmpeg_bswap.h lib_LTLIBRARIES = libxine.la -noinst_LTLBRARIES = libxine-interface.la + +# Technically, this is a lie; it just makes sure that we get a static lib. +noinst_LTLIBRARIES = libxine-interface.la libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ load_plugins.c video_decoder.c buffer_types.c \ @@ -32,7 +34,8 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ xine_private.h libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \ - $(pthread_dep) $(LIBXINEPOSIX) + $(pthread_dep) $(LIBXINEPOSIX) \ + libxine-interface.la libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LTLIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \ $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(XDG_BASEDIR_LIBS) \ @@ -42,14 +45,17 @@ 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/'.*'/''/" <$< >$@ +libxine_interface_la_SOURCES = + +libxine_interface_la_LDFLAGS = $(AM_LDFLAGS) $(def_ldflags) \ + -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) +# Yes, we need to install this. install-exec-hook: libxine-interface.la - $(INSTALL_DATA) "$(builddir)"/libxine-interface.la "$(DESTDIR)$(libdir)"/libxine-interface.la + $(INSTALL_DATA) libxine-interface.la "$(DESTDIR)$(libdir)"/libxine-interface.la clean-local: - rm -f "$(builddir)"/libxine-interface.la + rm -f libxine-interface.la $(XINEUTILS_LIB): $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la |