diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-13 20:48:11 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-13 20:48:11 +0200 |
| commit | a22e1e14c8b7e33dea182376bb32b77079e3317d (patch) | |
| tree | 8148e75538b1386d8cadf0f9041d6e4ddafaf048 /src/xine-engine/Makefile.am | |
| parent | 03918189506c443594f325a836b54220d36bb5a1 (diff) | |
| download | xine-lib-a22e1e14c8b7e33dea182376bb32b77079e3317d.tar.gz xine-lib-a22e1e14c8b7e33dea182376bb32b77079e3317d.tar.bz2 | |
Add a global handle for libxdg-basedir library to xine_s.
This handle can then be used by all plugins and other parts of the
xine engine without having to duplicate it.
Diffstat (limited to 'src/xine-engine/Makefile.am')
| -rw-r--r-- | src/xine-engine/Makefile.am | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index ecd1968f2..9db9f51ec 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,7 +1,18 @@ include $(top_srcdir)/misc/Makefile.common include $(top_srcdir)/lib/Makefile.common -AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(VISIBILITY_FLAG) +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_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE LIBTOOL = $(SHELL) $(top_builddir)/libtool @@ -24,11 +35,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) \ +libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(link_libxdg_basedir) \ $(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) + $(LIBXINEPOSIX) $(RT_LIBS) $(NET_LIBS) $(link_libxdg_basedir) libxine_la_LDFLAGS = \ -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ |