Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
dbcc2dec
Commit
dbcc2dec
authored
Jul 29, 2007
by
Rémi Denis-Courmont
Browse files
Remove INCLUDED_LIBINTL hack
parent
f243dbe4
Changes
3
Hide whitespace changes
Inline
Side-by-side
bindings/java/src/Makefile.am
View file @
dbcc2dec
...
...
@@ -32,8 +32,8 @@ jvlc$(LIBEXT): $(libjvlc_a_OBJECTS) \
$(libjvlc_a_DEPENDENCIES)
$(CXXLINK)
$(libjvlc_a_OBJECTS)
-Wl
,--kill-at
\
$(srcdir)
/libjvlc.def
\
$(LIBRARIES_libvlc)
-shared
$(LIBRARIES_libvlc)
$(LIBJINCLUDES)
$(LDFLAGS_jvlc)
\
$(INCLUDED_
LIBINTL)
$(LIBRARIES_libvlc)
-shared
$(LIBRARIES_libvlc)
$(LIBJINCLUDES)
\
$(LDFLAGS_jvlc)
$(LT
LIBINTL)
# Cygwin work-around, copied by other makefiles
@if
test
-f
"$@.exe"
;
then
mv
-f
"$@.exe"
"$@"
;
fi
...
...
configure.ac
View file @
dbcc2dec
...
...
@@ -366,19 +366,9 @@ AM_GNU_GETTEXT
AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl])
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], [${LIBINTL}])
])
VLC_ADD_LDFLAGS([libvlc vlc], [${LTLIBINTL}])
])
AC_SUBST(INCLUDED_LIBINTL)
dnl
dnl Iconv stuff
...
...
src/Makefile.am
View file @
dbcc2dec
...
...
@@ -105,7 +105,7 @@ endif
libvlc_la_SOURCES
=
$(SOURCES_libvlc)
nodist_libvlc_la_SOURCES
=
misc/revision.c
libvlc_la_LIBADD
=
$(
INCLUDED_
LIBINTL)
libvlc_la_LIBADD
=
$(
LT
LIBINTL)
libvlc_la_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
libvlc
`
libvlc_la_CXXFLAGS
=
`
$(VLC_CONFIG)
--cxxflags
libvlc
`
libvlc_la_OBJCFLAGS
=
`
$(VLC_CONFIG)
--objcflags
libvlc
`
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment