Skip to content

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

Remove unneeded old kludge

parent d57b277b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
Makefile.am
View file @ bc387d3d
...@@ -268,9 +268,7 @@ if HAVE_WINCE ...@@ -268,9 +268,7 @@ if HAVE_WINCE
vlc_WORKAROUNDLDFLAGS = $(LIBVLC) vlc_WORKAROUNDLDFLAGS = $(LIBVLC)
endif endif
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an vlc_DEPENDENCIES = src/$(LIB_libvlc) $(DATA_win32_rc)
# old automake-1.5 bug (automake/279).
DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc)
vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
...@@ -288,7 +286,7 @@ else ...@@ -288,7 +286,7 @@ else
vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin` vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin`
LIB_libvlc = libvlc.a LIB_libvlc = libvlc.a
LIBVLC = src/$(LIB_libvlc) LIBVLC = src/$(LIB_libvlc)
DEPENDENCIES_vlc += stamp-builtin vlc_DEPENDENCIES += stamp-builtin
endif endif
vlc_LDADD += $(INCLUDED_LIBINTL) vlc_LDADD += $(INCLUDED_LIBINTL)
endif endif
...@@ -306,7 +304,7 @@ core: libvlc ...@@ -306,7 +304,7 @@ core: libvlc
src/$(LIB_libvlc): libvlc src/$(LIB_libvlc): libvlc
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_DEPENDENCIES)
@rm -f vlc$(EXEEXT) @rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \ @case `$(VLC_CONFIG) --linkage vlc builtin` in \
c++) cmd="$(CXXLINK)" ;; \ c++) cmd="$(CXXLINK)" ;; \
......
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