From 3a9e97e677ebcd83f6c2f7a5b6c87c5fc1cfb50f Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sun, 9 Aug 2009 15:32:01 +0000
Subject: [PATCH] lib|rules.mk: Move Windows resource file creation into
 rules.mk

Move rule for creation of windows resource files into rules.mk,
because it's needed outside of the lib subdir.
---
 make/lib.mk   | 12 ------------
 make/rules.mk | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/make/lib.mk b/make/lib.mk
index f2e914d8..c335e4d3 100644
--- a/make/lib.mk
+++ b/make/lib.mk
@@ -72,18 +72,6 @@ echo.contrib-libs:
 	@echo CONTRIB_LIBS      = $(CONTRIB_LIBS)
 
 ifeq ($(TARGET),mingw)
-$(WINRES_RC): $(WINRES_RC_TMPL)
-	cat $< | sed " \
-		s/__VER_FILEVERSION__/$(MAJOR_VERSION),$(MINOR_VERSION),$(RELEASE_VERSION),$(BUILD_NUMBER)/; \
-		s/__VER_FILEVERSION_STR__/$(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION).$(BUILD_NUMBER)/; \
-		s/__VER_DESCRIPTION__/\"$(PROJECT_DESCR)\"/; \
-		s/__VER_COMPANY_NAME__/\"$(CUSTOMER)\"/; \
-	" > $@.tmp
-	mv $@.tmp $@
-
-$(WINRES_O): $(WINRES_RC)
-	$(WINDRES) $^ -o $@
-
 clean.winres:
 	rm -f $(WINRES_RC) $(WINRES_O) *.tmp
 
diff --git a/make/rules.mk b/make/rules.mk
index 2bc8223b..9fa51c5a 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -213,6 +213,18 @@ $(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
 	$(LD) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \
 		$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
 else
+$(WINRES_RC): $(WINRES_RC_TMPL)
+	cat $< | sed " \
+		s/__VER_FILEVERSION__/$(MAJOR_VERSION),$(MINOR_VERSION),$(RELEASE_VERSION),$(BUILD_NUMBER)/; \
+		s/__VER_FILEVERSION_STR__/$(MAJOR_VERSION).$(MINOR_VERSION).$(RELEASE_VERSION).$(BUILD_NUMBER)/; \
+		s/__VER_DESCRIPTION__/\"$(PROJECT_DESCR)\"/; \
+		s/__VER_COMPANY_NAME__/\"$(CUSTOMER)\"/; \
+	" > $@.tmp
+	mv $@.tmp $@
+
+$(WINRES_O): $(WINRES_RC)
+	$(WINDRES) $^ -o $@
+
 $(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
 	$(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \
 		sed 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \