summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-06-10 01:47:01 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-06-10 01:47:01 +0000
commit83ff1132a4ae2135854f38f080f3b96ce52ff51c (patch)
treea2fef24aa6cbca215dc397dd3a461f1312d3f82a /src
parent45ad987acde77605db7b2b22d6e0a18f3acff15f (diff)
downloadxine-lib-83ff1132a4ae2135854f38f080f3b96ce52ff51c.tar.gz
xine-lib-83ff1132a4ae2135854f38f080f3b96ce52ff51c.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/xine-engine/Makefile.am10
1 files changed, 2 insertions, 8 deletions
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