Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
bf5f9723
Commit
bf5f9723
authored
Feb 23, 2006
by
Rémi Denis-Courmont
Browse files
Fix linking with included gettext
parent
407e4502
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
bf5f9723
...
...
@@ -222,8 +222,8 @@ vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc)
endif
vlc_CFLAGS
=
`
$(VLC_CONFIG)
--cflags
vlc
`
vlc_LDFLAGS
=
$(LDFLAGS_libvlc)
$(vlc_WORKAROUNDLDFLAGS)
vlc_LDADD
=
$(DATA_win32_rc)
$(INCLUDED_LIBINTL)
vlc_LDFLAGS
=
$(LDFLAGS_libvlc)
$(vlc_WORKAROUNDLDFLAGS)
$(INCLUDED_LIBINTL)
vlc_LDADD
=
$(DATA_win32_rc)
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279).
...
...
@@ -250,7 +250,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
objc
)
cmd
=
"
$(OBJCLINK)
"
;;
\
c|
*
)
cmd
=
"
$(LINK)
"
;;
\
esac
;
\
cmd
=
"
$$
cmd
$(vlc_OBJECTS)
$(vlc_LDADD)
$(vlc_LDFLAGS)
$(LIBS)
"
;
\
cmd
=
"
$$
cmd
$(vlc_OBJECTS)
$(vlc_LDADD)
$(vlc_LDFLAGS)
"
;
\
echo
$$
cmd
;
\
eval
$$
cmd
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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