X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bin%2FMakefile.am;h=debbc23f8b22dc8bab3c24cf7c5c69d0c24461d7;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=eb92663503afddc43e3cc33ee070b026161b225b;hpb=e778ca644111d08515520eea8a2f97f4dfeb048c;p=vlc

diff --git a/bin/Makefile.am b/bin/Makefile.am
index eb92663503..debbc23f8b 100644
--- 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,35 +14,51 @@ 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
 endif
 
 vlc_wrapper_SOURCES = rootwrap.c
+vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
-vlc_DEPENDENCIES = ../src/libvlc.la
-
+vlc_DEPENDENCIES = ../src/libvlc.sym
 vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-vlc_LDADD = ../src/libvlc.la `$(VLC_CONFIG) -libs vlc`
+vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la `$(VLC_CONFIG) -libs vlc`
 
 vlc_static_SOURCES = $(vlc_SOURCES)
+vlc_static_CFLAGS = $(AM_CFLAGS) \
+	-DTOP_BUILDDIR=\"$$(cd "$(top_builddir)"; pwd)\" \
+	-DTOP_SRCDIR=\"$$(cd "$(top_srcdir)"; pwd)\" \
+	$(NULL)
 vlc_static_DEPENDENCIES = $(vlc_DEPENDENCIES)
 vlc_static_LDADD = $(vlc_LDADD)
 vlc_static_LDFLAGS = $(vlc_LDFLAGS) -no-install -static
 
 if HAVE_WIN32
-vlc_LDADD += vlc_win32_rc.$(OBJEXT)
+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