diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-13 22:59:01 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-13 22:59:01 +0200 |
| commit | e13967be39c08ed76ddc6f6d15b2b81d5243e1b0 (patch) | |
| tree | 57b58fdd81f858afaecd9332bff3d93d90cc8c82 | |
| parent | bc08742b7ee940fcc0da034fee25154e4d3a1021 (diff) | |
| download | xine-lib-e13967be39c08ed76ddc6f6d15b2b81d5243e1b0.tar.gz xine-lib-e13967be39c08ed76ddc6f6d15b2b81d5243e1b0.tar.bz2 | |
Simplify handling of internal/external libxdg-basedir, as it's going to be used in a few more cases.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | misc/Makefile.common | 3 | ||||
| -rw-r--r-- | src/xine-engine/Makefile.am | 17 |
3 files changed, 11 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 8817e3902..0a08d01c5 100644 --- a/configure.ac +++ b/configure.ac @@ -330,10 +330,15 @@ if test "x$with_external_libxdg_basedir" = "xyes"; then XDG_BASEDIR_CFLAGS='' XDG_BASEDIR_LIBS='-lxdg-basedir' +else + XDG_BASEDIR_CFLAGS='-I$(top_srcdir)/contrib/libxdg-basedir' + XDG_BASEDIR_LIBS='$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la' + XDG_BASEDIR_DEPS='$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la' fi AC_SUBST([XDG_BASEDIR_CFLAGS]) AC_SUBST([XDG_BASEDIR_LIBS]) +AC_SUBST([XDG_BASEDIR_DEPS]) AM_CONDITIONAL([EXTERNAL_LIBXDG_BASEDIR], [test "x$with_external_libxdg_basedir" = "xyes"]) diff --git a/misc/Makefile.common b/misc/Makefile.common index d23ea5b5e..a3fe43de6 100644 --- a/misc/Makefile.common +++ b/misc/Makefile.common @@ -11,6 +11,9 @@ vidixdir = $(XINE_PLUGINDIR)/vidix $(XINE_LIB): @cd $(top_srcdir)/src/xine-engine && $(MAKE) +$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la: + $(MAKE) -C $(top_builddir)/contrib/libxdg-basedir + install-data-hook: @if test $$MAKELEVEL -le 4 ; then \ if test -x "$(top_srcdir)/post-install.sh" ; then \ diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 9db9f51ec..aeb142708 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,18 +1,7 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common -if !EXTERNAL_LIBXDG_BASEDIR -link_libxdg_basedir = $(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la -cflags_libxdg_basedir = -I$(top_srcdir)/contrib/libxdg-basedir - -$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la: - $(MAKE) -C $(top_builddir)/contrib/libxdg-basedir -else -link_libxdg_basedir = $(XDG_BASEDIR_LIBS) -cflags_libxdg_basedir = $(XDG_BASEDIR_CFLAGS) -endif - -AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(cflags_libxdg_basedir) $(VISIBILITY_FLAG) +AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(XDG_BASEDIR_CFLAGS) $(VISIBILITY_FLAG) AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -35,11 +24,11 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ # FIXME: these are currently unused: EXTRA_DIST = lrb.c lrb.h accel_xvmc.h -libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(link_libxdg_basedir) \ +libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \ $(pthread_dep) $(LIBXINEPOSIX) libxine_la_LIBADD = $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) $(FONTCONFIG_LIBS) \ - $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(link_libxdg_basedir) + $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(XDG_BASEDIR_LIBS) libxine_la_LDFLAGS = \ -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ |