Use var_InheritString for --decklink-video-connection.

[vlc] / bin / Makefile.am

diff --git a/bin/Makefile.am b/bin/Makefile.am
index dfeaee26acfc41279e8166012c95ec257c74a053..debbc23f8b22dc8bab3c24cf7c5c69d0c24461d7 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -14,7 +14,7 @@ AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if !HAVE_WIN32
 if !HAVE_WINCE
 bin_PROGRAMS += vlc-wrapper
-vlc_SOURCES = vlc.c
+vlc_SOURCES = vlc.c override.c
 endif
 endif
 
@@ -46,16 +46,19 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
 if HAVE_WIN32
 vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
 vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
+else
+vlc_LDADD += $(LIBDL)
 endif
 
-.rc.in.rc: $(top_builddir)/config.status
+vlc_win32_rc.rc: $(top_builddir)/config.status vlc_win32_rc.rc.in
        cd "$(top_builddir)" && \
        $(SHELL) ./config.status --file="bin/$@"
 
 vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
-       $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+       $(WINDRES) --include-dir $(top_srcdir)/share/icons -i $< -o $@
 
 vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
+       $(GNUGETOPT_LIBS) \
        ../compat/libcompat.la \
        ../src/libvlc.la ../src/libvlccore.la