From d3c4eb73631b0f3fb5b08400592f438f0cf71f79 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 5 Apr 2015 14:53:59 +0100
Subject: Move some beos specific make rules into its MAkefile.target

---
 Makefile             |  9 ---------
 beos/Makefile.target | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 3431ac905..332108656 100644
--- a/Makefile
+++ b/Makefile
@@ -623,15 +623,6 @@ ifeq ($(TARGET),beos)
 	$(Q)$(BEOS_MIMESET) $(EXETARGET)
 endif
 
-ifeq ($(TARGET),beos)
-$(RDEF_IMP_BEOS): $(RDEP_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) -I beos -o $@ $^
-endif
 
 clean-target:
 	$(VQ)echo "   CLEAN: $(EXETARGET)"
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 478593cf6..bab6429b8 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -27,8 +27,6 @@ BEOS_MIMESET := mimeset
 VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c)
 VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
 VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
-RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS))))
-RESOURCES = $(RSRC_BEOS)
 
 ifeq ($(HOST),beos)
   CFLAGS += -I/boot/home/config/include		\
@@ -123,6 +121,22 @@ RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS))			\
 SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
 EXETARGET := NetSurf
 
+# ----------------------------------------------------------------------------
+# Resources
+# ----------------------------------------------------------------------------
+
+RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS))))
+RESOURCES = $(RSRC_BEOS)
+
+$(RDEF_IMP_BEOS): $(RDEP_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) -I beos -o $@ $^
+
+
 # ----------------------------------------------------------------------------
 # Install target
 # ----------------------------------------------------------------------------
-- 
cgit v1.2.3