Use var_Inherit* instead of var_CreateGet*.

[vlc] / bin / Makefile.am

diff --git a/bin/Makefile.am b/bin/Makefile.am
index d90c6d596a5dfbd0ce451622eed8f498f94e5bea..debbc23f8b22dc8bab3c24cf7c5c69d0c24461d7 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -2,7 +2,11 @@
 #
 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`
 
@@ -10,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
@@ -41,8 +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 $@
+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/icons -i $< -o $@
 
+vlc_cache_gen_SOURCES = cachegen.c
+vlc_cache_gen_LDADD = \
+       $(GNUGETOPT_LIBS) \
+       ../compat/libcompat.la \
+       ../src/libvlc.la ../src/libvlccore.la