diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-16 12:41:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-16 12:41:23 +0000 |
| commit | ba1d0ea6a83e10fad62f6e8c9b9bd573083762f3 (patch) | |
| tree | 92fd2e44532aad77d0268cbc156e1867004798c3 | |
| parent | 8b9f9274c643e1203e35f092337b90396b373c75 (diff) | |
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
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | 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@ @@ -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 |