Skip to content

V
vlc-1.1
Commit bf5f9723 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix linking with included gettext

parent 407e4502
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Makefile.am
View file @ bf5f9723
...@@ -222,8 +222,8 @@ vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc) ...@@ -222,8 +222,8 @@ vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc)
endif endif
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS) vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS) $(INCLUDED_LIBINTL)
vlc_LDADD = $(DATA_win32_rc) $(INCLUDED_LIBINTL) vlc_LDADD = $(DATA_win32_rc)
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279). # old automake-1.5 bug (automake/279).
...@@ -250,7 +250,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) ...@@ -250,7 +250,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
objc) cmd="$(OBJCLINK)" ;; \ objc) cmd="$(OBJCLINK)" ;; \
c|*) cmd="$(LINK)" ;; \ c|*) cmd="$(LINK)" ;; \
esac ; \ esac ; \
cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \ cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
echo $$cmd ; \ echo $$cmd ; \
eval $$cmd eval $$cmd
......
Markdown is supported
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