X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=92e687940df3c3a90d6a88edd305b6b83ba039c1;hb=89486ccb0bcebd2e047cdcf2d2c51a59ec4a0adf;hp=009d7b239b6e7210d0f1fa9de597335d6c1797f1;hpb=f974baf1756aebf491bfc51858de432540ea0959;p=vlc

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 009d7b239b..92e687940d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -4,6 +4,9 @@ bin_PROGRAMS = vlc
 noinst_PROGRAMS = vlc-static
 vlclib_PROGRAMS = vlc-cache-gen
 EXTRA_PROGRAMS = vlc-wrapper
+EXTRA_DIST = vlc_win32_rc.rc.in
+
+SUFFIXES = .rc.in .rc
 
 AM_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 
@@ -11,13 +14,14 @@ 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
 
 EXTRA_vlc_SOURCES = vlc.c winvlc.c
 if HAVE_WIN32
 vlc_SOURCES = winvlc.c
+noinst_DATA = vlc_win32_rc.rc
 endif
 if HAVE_WINCE
 vlc_SOURCES = winvlc.c
@@ -42,12 +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
 
-vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc
-	$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
+.rc.in.rc: $(top_builddir)/config.status
+	cd "$(top_builddir)" && \
+	$(SHELL) ./config.status --file="bin/$@"
+
+vlc_win32_rc.$(OBJEXT): vlc_win32_rc.rc
+	$(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