[vlc-devel] commit: Generate Windows resource file on need basis ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 31 12:53:39 2010 +0200| [19bed424e1bc4756ae6593e2352b6edd127cefa1] | committer: Rémi Denis-Courmont 

Generate Windows resource file on need basis

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=19bed424e1bc4756ae6593e2352b6edd127cefa1
---

 bin/Makefile.am                      |   10 +++++++++-
 {share => bin}/vlc_win32_rc.rc.in    |    0 
 configure.ac                         |    2 --
 share/Makefile.am                    |    4 +---
 src/Makefile.am                      |   17 +++++++++++++++--
 {share => src}/libvlc_win32_rc.rc.in |    0 
 6 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 009d7b2..dfeaee2 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`
 
@@ -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 fda159f..ef73309 100644
--- 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 0dae816..3135827 100644
--- 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 49b2cb4..fa26a9d 100644
--- 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