ruby-changes:43625
From: nobu <ko1@a...>
Date: Sat, 16 Jul 2016 21:41:28 +0900 (JST)
Subject: [ruby-changes:43625] nobu:r55698 (trunk): common.mk: INCFLAGS
nobu 2016-07-16 21:41:23 +0900 (Sat, 16 Jul 2016) New Revision: 55698 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55698 Log: common.mk: INCFLAGS * common.mk (INCFLAGS): move from Makefile.in. * win32/Makefile.sub (XCFLAGS): missing directory is not neccessary as an include path. Modified files: trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Index: common.mk =================================================================== --- common.mk (revision 55697) +++ common.mk (revision 55698) @@ -18,6 +18,8 @@ RUBYLIB = $(PATH_SEPARATOR) https://github.com/ruby/ruby/blob/trunk/common.mk#L18 RUBYOPT = - RUN_OPTS = --disable-gems +INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) + GEM_HOME = GEM_PATH = GEM_VENDOR = Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 55697) +++ win32/Makefile.sub (revision 55698) @@ -265,7 +265,7 @@ DLNOBJ = dln.obj https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L265 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 Index: Makefile.in =================================================================== --- Makefile.in (revision 55697) +++ Makefile.in (revision 55698) @@ -67,7 +67,6 @@ optflags = @optflags@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L67 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@ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/