From ba1d0ea6a83e10fad62f6e8c9b9bd573083762f3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 16 Jul 2016 12:41:23 +0000
Subject: common.mk: INCFLAGS

* common.mk (INCFLAGS): move from Makefile.in.

* win32/Makefile.sub (XCFLAGS): missing directory is not
  neccessary as an include path.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55698 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 Makefile.in        | 1 -
 common.mk          | 2 ++
 win32/Makefile.sub | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 09b7ca3322..e1d9c3dee9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,7 +67,6 @@ optflags = @optflags@
 debugflags = @debugflags@
 warnflags = @warnflags@ @strict_warnflags@
 cppflags = @cppflags@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
 XCFLAGS = @XCFLAGS@
 CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
diff --git a/common.mk b/common.mk
index 93eb2925c4..90208344ac 100644
--- a/common.mk
+++ b/common.mk
@@ -18,6 +18,8 @@ RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
+
 GEM_HOME =
 GEM_PATH =
 GEM_VENDOR =
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 4fcb0144cd..1791adbb18 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -265,7 +265,7 @@ DLNOBJ = dln.obj
 ARFLAGS = -machine:$(MACHINE) -out:
 LD = $(CC)
 LDSHARED = $(LD) -LD
-XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing $(XCFLAGS)
+XCFLAGS = -DRUBY_EXPORT $(INCFLAGS) $(XCFLAGS)
 !if $(MSC_VER) >= 1400
 # Prevents VC++ 2005 (cl ver 14) warnings
 MANIFESTTOOL = mt -nologo
-- 
cgit v1.2.3