[xine-cvs] HG: xine-lib-1.2-libxdg-basedir: Simplify handling of internal/external libxdg-basedir, as it's going to be used in a few more cases.

[<fla...@gm...>]

# HG changeset patch
# User Diego 'Flameeyes' Pettenò <fla...@gm...>
# Date 1176497941 -7200
# Node ID 8861b857c8990123a24d7dee2f82a3cf72171c14
# Parent  048211e86bc19bfbdb8ecffdfc37ce9eeb8dd701
Simplify handling of internal/external libxdg-basedir, as it's going to be used in a few more cases.

diff -r 8861b857c8990123a24d7dee2f82a3cf72171c14 -r 048211e86bc19bfbdb8ecffdfc37ce9eeb8dd701 configure.ac
--- a/configure.ac	Fri Apr 13 22:59:01 2007 +0200
+++ b/configure.ac	Fri Apr 13 22:40:31 2007 +0200
@@ -330,10 +330,15 @@ if test "x$with_external_libxdg_basedir"
 
    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 -r 8861b857c8990123a24d7dee2f82a3cf72171c14 -r 048211e86bc19bfbdb8ecffdfc37ce9eeb8dd701 misc/Makefile.common
--- a/misc/Makefile.common	Fri Apr 13 22:59:01 2007 +0200
+++ b/misc/Makefile.common	Fri Apr 13 22:40:31 2007 +0200
@@ -10,6 +10,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 \
diff -r 8861b857c8990123a24d7dee2f82a3cf72171c14 -r 048211e86bc19bfbdb8ecffdfc37ce9eeb8dd701 src/xine-engine/Makefile.am
--- a/src/xine-engine/Makefile.am	Fri Apr 13 22:59:01 2007 +0200
+++ b/src/xine-engine/Makefile.am	Fri Apr 13 22:40:31 2007 +0200
@@ -1,18 +1,7 @@ include $(top_srcdir)/misc/Makefile.comm
 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 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) \