Generate Windows resource file on need basis

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 009d7b239b6e7210d0f1fa9de597335d6c1797f1..dfeaee26acfc41279e8166012c95ec257c74a053 100644 (file)
--- 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`
 
@@ -18,6 +21,7 @@ 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
@@ -44,7 +48,11 @@ vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
 vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT)
 endif
 
-vlc_win32_rc.$(OBJEXT): $(top_builddir)/share/vlc_win32_rc.rc
+.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 -i $< -o $@
 
 vlc_cache_gen_SOURCES = cachegen.c

diff --git a/share/vlc_win32_rc.rc.in b/bin/vlc_win32_rc.rc.in
similarity index 100%
rename from share/vlc_win32_rc.rc.in
rename to bin/vlc_win32_rc.rc.in

diff --git a/configure.ac b/configure.ac
index fda159f961b94109e7ebeecd11e77ae6ea730c9c..ef733095dda82c292f768ab9979a87f3e59e055f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4935,8 +4935,6 @@ AC_CONFIG_FILES([
   projects/mozilla/vlc.r
   projects/mozilla/install.js
   share/Makefile
-  share/vlc_win32_rc.rc
-  share/libvlc_win32_rc.rc
   compat/Makefile
   src/Makefile
   src/test/Makefile

diff --git a/share/Makefile.am b/share/Makefile.am
index 0dae8168618a4e3b8a97ab4fa8438f9c184a3c4b..3135827045b7a81995f1e3903a8dde2aedd40d37 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -55,9 +55,7 @@ DIST_rsrc = \
        newres.h \
        resource.h \
        vlc_wince_rc.rc \
-       vlc_beos.rsrc \
-       vlc_win32_rc.rc.in \
-       libvlc_win32_rc.rc.in
+       vlc_beos.rsrc
 
 DIST_icons = vlc.ico
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 49b2cb451b8549ad6ec5a37fa45071609aad5f96..fa26a9d5f21a3cc27933441924f64ea6ef8a0c32 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST = extras/COPYING \
 BUILT_SOURCES = ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
-SUFFIXES = .pc.in .pc
+SUFFIXES = .pc.in .pc .rc.in .rc
 
 ###############################################################################
 # Headers
@@ -157,6 +157,19 @@ CLEANFILES += $(pkgconfig_DATA)
        cd "$(top_builddir)" && \
        $(SHELL) ./config.status --file="src/$@"
 
+##############################################################################
+# Windows resource files
+##############################################################################
+
+if HAVE_WIN32
+noinst_DATA = libvlc_win32_rc.rc
+endif
+EXTRA_DIST += libvlc_win32_rc.rc.in
+
+.rc.in.rc: $(top_builddir)/config.status
+       cd "$(top_builddir)" && \
+       $(SHELL) ./config.status --file="src/$@"
+
 ###############################################################################
 # Building libvlc
 ###############################################################################
@@ -195,7 +208,7 @@ libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
 libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT)
 endif
 
-libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc
+libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
        $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@
 
 libvlc_la_SOURCES = $(SOURCES_libvlc_control)

diff --git a/share/libvlc_win32_rc.rc.in b/src/libvlc_win32_rc.rc.in
similarity index 100%
rename from share/libvlc_win32_rc.rc.in
rename to src/libvlc_win32_rc.rc.in