Commit dbcc2dec authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Remove INCLUDED_LIBINTL hack

parent f243dbe4
...@@ -32,8 +32,8 @@ jvlc$(LIBEXT): $(libjvlc_a_OBJECTS) \ ...@@ -32,8 +32,8 @@ jvlc$(LIBEXT): $(libjvlc_a_OBJECTS) \
$(libjvlc_a_DEPENDENCIES) $(libjvlc_a_DEPENDENCIES)
$(CXXLINK) $(libjvlc_a_OBJECTS) -Wl,--kill-at \ $(CXXLINK) $(libjvlc_a_OBJECTS) -Wl,--kill-at \
$(srcdir)/libjvlc.def \ $(srcdir)/libjvlc.def \
$(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LIBJINCLUDES) $(LDFLAGS_jvlc) \ $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LIBJINCLUDES) \
$(INCLUDED_LIBINTL) $(LDFLAGS_jvlc) $(LTLIBINTL)
# Cygwin work-around, copied by other makefiles # Cygwin work-around, copied by other makefiles
@if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
......
...@@ -366,19 +366,9 @@ AM_GNU_GETTEXT ...@@ -366,19 +366,9 @@ AM_GNU_GETTEXT
AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [ AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl]) AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl])
AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl" AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl"
AS_IF([test "${enable_libtool}" != "no"], [
INCLUDED_LIBINTL="${LTLIBINTL}"
],[
INCLUDED_LIBINTL="${LIBINTL}"
])
], [ ], [
AS_IF([test "${enable_libtool}" != "no"], [ VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
], [
VLC_ADD_LDFLAGS([libvlc vlc], [${LIBINTL}])
])
]) ])
AC_SUBST(INCLUDED_LIBINTL)
dnl dnl
dnl Iconv stuff dnl Iconv stuff
......
...@@ -105,7 +105,7 @@ endif ...@@ -105,7 +105,7 @@ endif
libvlc_la_SOURCES = $(SOURCES_libvlc) libvlc_la_SOURCES = $(SOURCES_libvlc)
nodist_libvlc_la_SOURCES = misc/revision.c nodist_libvlc_la_SOURCES = misc/revision.c
libvlc_la_LIBADD = $(INCLUDED_LIBINTL) libvlc_la_LIBADD = $(LTLIBINTL)
libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment