Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move --include-dir from helper.mk to rules.mak

Browse source 
svn path=/trunk/; revision=8275
This commit is contained in:
Gé van Geldorp 2004-02-19 22:24:59 +00:00
parent 59e447fc8f
commit 1355d672b4
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/rules.mak
View file

@ -86,7 +86,7 @@ CPP = $(PREFIX)cpp
AR = $(PREFIX)ar AR = $(PREFIX)ar
RC = $(PREFIX)windres RC = $(PREFIX)windres
WRC = $(WINE_TOP)/tools/wrc/wrc 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 OBJCOPY = $(PREFIX)objcopy
OBJDUMP =$(PREFIX)objdump OBJDUMP =$(PREFIX)objdump
TOOLS_PATH = $(PATH_TO_TOP)/tools TOOLS_PATH = $(PATH_TO_TOP)/tools

15
reactos/tools/helper.mk
View file

@ -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 # Helper makefile for ReactOS modules
# Variables this makefile accepts: # Variables this makefile accepts:
@ -150,7 +150,6 @@ ifeq ($(TARGET_TYPE),proglib)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -I./ -I$(SDK_PATH_INC) MK_CFLAGS := -I./ -I$(SDK_PATH_INC)
MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC) MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC)
MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
MK_IMPLIB := yes MK_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := $(SDK_PATH_LIB) MK_IMPLIBDEFPATH := $(SDK_PATH_LIB)
@ -171,7 +170,6 @@ ifeq ($(TARGET_TYPE),dynlink)
ifneq ($(WINE_MODE),yes) ifneq ($(WINE_MODE),yes)
MK_CFLAGS := -I./ -I$(SDK_PATH_INC) MK_CFLAGS := -I./ -I$(SDK_PATH_INC)
MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC) MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC)
MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
else else
MK_CFLAGS := -I$(PATH_TO_TOP)/include/wine -I./ -I$(WINE_INCLUDE) MK_CFLAGS := -I$(PATH_TO_TOP)/include/wine -I./ -I$(WINE_INCLUDE)
MK_CPPFLAGS := -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_SDKLIBS :=
MK_CFLAGS := -I./ -I$(SDK_PATH_INC) MK_CFLAGS := -I./ -I$(SDK_PATH_INC)
MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC) MK_CPPFLAGS := -I./ -I$(SDK_PATH_INC)
MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
MK_IMPLIB := no MK_IMPLIB := no
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := MK_IMPLIBDEFPATH :=
@ -218,7 +215,6 @@ ifeq ($(TARGET_TYPE),kmlibrary)
MK_DEFEXT := .a MK_DEFEXT := .a
MK_CFLAGS := -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -I./ -I$(DDK_PATH_INC) MK_CPPFLAGS := -I./ -I$(DDK_PATH_INC)
MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
MK_IMPLIB := no MK_IMPLIB := no
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@ -233,7 +229,6 @@ ifeq ($(TARGET_TYPE),driver_library)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -I./ -I$(DDK_PATH_INC) MK_CPPFLAGS := -I./ -I$(DDK_PATH_INC)
MK_RCFLAGS := --include-dir $(SDK_PATH_INC)
MK_IMPLIB := no MK_IMPLIB := no
MK_IMPLIBONLY := yes MK_IMPLIBONLY := yes
MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@ -253,7 +248,6 @@ ifeq ($(TARGET_TYPE),driver)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := no
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := MK_IMPLIBDEFPATH :=
@ -273,7 +267,6 @@ ifeq ($(TARGET_TYPE),export_driver)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@ -293,7 +286,6 @@ ifeq ($(TARGET_TYPE),hal)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTHAL__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTHAL__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := MK_IMPLIBDEFPATH :=
@ -313,7 +305,6 @@ ifeq ($(TARGET_TYPE),bootpgm)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := no
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := MK_IMPLIBDEFPATH :=
@ -333,7 +324,6 @@ ifeq ($(TARGET_TYPE),miniport)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := no
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := MK_IMPLIBDEFPATH :=
@ -353,7 +343,6 @@ ifeq ($(TARGET_TYPE),gdi_driver)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@ -418,7 +407,6 @@ ifeq ($(TARGET_TYPE),subsystem)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)
@ -437,7 +425,6 @@ ifeq ($(TARGET_TYPE),kmdll)
MK_SDKLIBS := MK_SDKLIBS :=
MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC) MK_CFLAGS := -D__NTDRIVER__ -I./ -I$(DDK_PATH_INC)
MK_CPPFLAGS := -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_IMPLIB := yes
MK_IMPLIBONLY := no MK_IMPLIBONLY := no
MK_IMPLIBDEFPATH := $(DDK_PATH_LIB) MK_IMPLIBDEFPATH := $(DDK_PATH_LIB)