From 83ff1132a4ae2135854f38f080f3b96ce52ff51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 10 Jun 2006 01:47:01 +0000 Subject: Update gettext to 0.14.5, remove intl/ subdirectory so that external gettext is used, as discussed in xine-devel. CVS patchset: 8027 CVS date: 2006/06/10 01:47:01 --- src/xine-engine/Makefile.am | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index 8bd404993..2ec481960 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -24,12 +24,9 @@ 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 -if INCLUDED_INTL -INCLUDED_INTLLIBS = @INTLLIBS@ -endif -libxine_la_DEPENDENCIES = $(INCLUDED_INTLLIBS) $(XINEUTILS_LIB) \ +libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) \ $(pthread_dep) $(LIBXINEPOSIX) -libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \ +libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) $(LTLIBINTL) $(ZLIB_LIBS) \ -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \ $(LIBXINEPOSIX) $(RT_LIBS) @@ -54,8 +51,5 @@ uninstall-local: rm -f $(DEF_FILE) endif -@INCLUDED_INTL_TRUE@@INTLLIBS@: -@INCLUDED_INTL_TRUE@ @cd $(top_builddir)/intl && $(MAKE) libintl.la - $(XINEUTILS_LIB): $(MAKE) -C $(top_builddir)/src/xine-utils libxineutils.la -- cgit v1.2.3