From 1355d672b4e7ea2847e7485670fe420123a7c943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 19 Feb 2004 22:24:59 +0000
Subject: [PATCH] Move --include-dir from helper.mk to rules.mak

svn path=/trunk/; revision=8275
---
 reactos/rules.mak       |  2 +-
 reactos/tools/helper.mk | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/reactos/rules.mak b/reactos/rules.mak
index 4ef0db56021..e23920f6fc7 100644
--- a/reactos/rules.mak
+++ b/reactos/rules.mak
@@ -86,7 +86,7 @@ CPP = $(PREFIX)cpp
 AR = $(PREFIX)ar
 RC = $(PREFIX)windres
 WRC = $(WINE_TOP)/tools/wrc/wrc
-# already defined via makefile "helper.mk": RCINC = --include-dir $(PATH_TO_TOP)/include
+RCINC = --include-dir $(PATH_TO_TOP)/include
 OBJCOPY = $(PREFIX)objcopy
 OBJDUMP =$(PREFIX)objdump
 TOOLS_PATH = $(PATH_TO_TOP)/tools
diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk
index 7ef2c01786f..0a6d2deb261 100644
--- a/reactos/tools/helper.mk
+++ b/reactos/tools/helper.mk
@@ -1,4 +1,4 @@
-# $Id: helper.mk,v 1.50 2004/02/09 07:03:16 vizzini Exp $
+# $Id: helper.mk,v 1.51 2004/02/19 22:24:58 gvg Exp $
 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:
@@ -150,7 +150,6 @@ ifeq ($(TARGET_TYPE),proglib)
   MK_SDKLIBS :=
   MK_CFLAGS := -I./ -I$(SDK_PATH_INC)
   MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(SDK_PATH_LIB)
@@ -171,7 +170,6 @@ ifeq ($(TARGET_TYPE),dynlink)
 ifneq ($(WINE_MODE),yes)
   MK_CFLAGS := -I./ -I$(SDK_PATH_INC)
   MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
 else
   MK_CFLAGS := -I$(PATH_TO_TOP)/include/wine -I./ -I$(WINE_INCLUDE)
   MK_CPPFLAGS := -I$(PATH_TO_TOP)/include/wine -I./ -I$(WINE_INCLUDE)
@@ -201,7 +199,6 @@ ifeq ($(TARGET_TYPE),library)
   MK_SDKLIBS :=
   MK_CFLAGS := -I./ -I$(SDK_PATH_INC)
   MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
@@ -218,7 +215,6 @@ ifeq ($(TARGET_TYPE),kmlibrary)
   MK_DEFEXT := .a
   MK_CFLAGS := -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@@ -233,7 +229,6 @@ ifeq ($(TARGET_TYPE),driver_library)
   MK_SDKLIBS :=
   MK_CFLAGS := -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := no
   MK_IMPLIBONLY := yes
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@@ -253,7 +248,6 @@ ifeq ($(TARGET_TYPE),driver)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
@@ -273,7 +267,6 @@ ifeq ($(TARGET_TYPE),export_driver)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@@ -293,7 +286,6 @@ ifeq ($(TARGET_TYPE),hal)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTHAL__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTHAL__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
@@ -313,7 +305,6 @@ ifeq ($(TARGET_TYPE),bootpgm)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
@@ -333,7 +324,6 @@ ifeq ($(TARGET_TYPE),miniport)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := no
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH :=
@@ -353,7 +343,6 @@ ifeq ($(TARGET_TYPE),gdi_driver)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@@ -418,7 +407,6 @@ ifeq ($(TARGET_TYPE),subsystem)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@@ -437,7 +425,6 @@ ifeq ($(TARGET_TYPE),kmdll)
   MK_SDKLIBS :=
   MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
   MK_CPPFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
-  MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
   MK_IMPLIB := yes
   MK_IMPLIBONLY := no
   MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)