From 4ebb145a7d2d75139a6cab6863c0e3eb85a5282c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revel?= <mmu_man@netsurf-browser.org>
Date: Sun, 8 May 2011 01:03:44 +0000
Subject: [PATCH] Automatically build an rdef file importing the resources
 listed as dependencies for BeOS.

svn path=/trunk/netsurf/; revision=12306
---
 Makefile             |  9 +++++++--
 beos/Makefile.target | 11 +++++++++--
 beos/beos_res.rdef   | 12 ------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 53e4e70a5..0fb5b043f 100644
--- a/Makefile
+++ b/Makefile
@@ -426,9 +426,14 @@ ifeq ($(TARGET),beos)
 endif
 
 ifeq ($(TARGET),beos)
-$(RSRC_BEOS): $(RDEF_BEOS) $(RDEP_BEOS)
+$(RDEF_IMP_BEOS): $(RDEP_BEOS)
+	echo $(RDEF_IMP_BEOS)
+	$(VQ)echo "     GEN: $@"
+	$(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@
+
+$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS)
 	$(VQ)echo "      RC: $<"
-	$(Q)$(BEOS_RC) -o $@ $<
+	$(Q)$(BEOS_RC) -I beos -o $@ $^
 endif
 
 ifeq ($(TARGET),riscos)
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 8cb837530..dc638924a 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -91,11 +91,18 @@ S_BEOS := beos_about.cpp beos_bitmap.cpp beos_fetch_rsrc.cpp		\
 	beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp		\
 	beos_window.cpp system_colour.cpp
 S_BEOS := $(addprefix beos/,$(S_BEOS))
+
 RDEF_BEOS := beos_res.rdef
 RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
-RDEP_BEOS := adblock.css beosdefault.css default.css ca-bundle.txt	\
-	messages
+
+RDEF_IMP_BEOS := beos_res_import.rdef
+RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS)))
+
+RDEP_BEOS := \
+	adblock.css beosdefault.css default.css internal.css quirks.css	\
+	netsurf.png ca-bundle.txt messages
 RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS))			\
+	$(wildcard beos/res/Icons/*.png)				\
 	$(wildcard beos/res/throbber/throbber*.png)
 
 
diff --git a/beos/beos_res.rdef b/beos/beos_res.rdef
index 29fe5232a..8cb8fd09f 100644
--- a/beos/beos_res.rdef
+++ b/beos/beos_res.rdef
@@ -18,18 +18,6 @@
 
 #include "beos_res.h"
 
-resource(200, "default.css") #'data' import "res/default.css";
-resource(201, "beosdefault.css") #'data' import "res/beosdefault.css";
-resource(202, "adblock.css") #'data' import "res/adblock.css";
-resource(203, "ca-bundle.txt") #'data' import "res/ca-bundle.txt";
-resource(204, "messages") #'data' import "res/messages";
-/* resource(206, "about.en.html") #'data' import "res/about.en.html"; */
-/* resource(210, "netsurf.xpm") #'data' import "res/netsurf.xpm"; */
-resource(205, "netsurf.png") #'data' import "res/netsurf.png";
-resource(206, "internal.css") #'data' import "res/internal.css";
-resource(207, "Icons/directory.png") #'data' import "res/Icons/directory.png";
-resource(208, "Icons/content.png") #'data' import "res/Icons/content.png";
-
 /* throbber */
 resource(400, "throbber0.png") #'data' import "res/throbber/throbber0.png";
 resource(401, "throbber1.png") #'data' import "res/throbber/throbber1.png";