summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-14 02:45:11 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-14 02:45:11 +0000
commit0d8df8889342b3d235ffcea209beea5032c9a711 (patch)
treeaba3bceae0d0d9c55d51b48b6df45d95d4bf3d8f
parent81be10bd853ed8a502a0a02ea706c9567b469c67 (diff)
* common.mk (parse.h): workaround for nmake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--bcc32/Makefile.sub1
-rw-r--r--common.mk4
-rw-r--r--win32/Makefile.sub1
4 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9201d9f..ad92199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 14 11:45:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (parse.h): workaround for nmake.
+
Thu Aug 14 06:09:12 2008 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_thread_execute_interrupts): switch event
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 6ce6d4f..2434b2f 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -59,7 +59,6 @@ RC = brcc32
!endif
!ifndef YACC
YACC = bison
-YFLAGS = -o y.tab.c
!endif
!ifndef AR
AR = tlib
diff --git a/common.mk b/common.mk
index d1f8e4f..4071646 100644
--- a/common.mk
+++ b/common.mk
@@ -390,10 +390,10 @@ enc.mk: $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/de
PHONY:
{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed
-{$(VPATH)}parse.h: {$(VPATH)}parse.c
+parse.h {$(VPATH)}parse.h: {$(VPATH)}parse.c
{$(srcdir)}.y.c:
- $(YACC) -d $(YFLAGS) -o y.tab.c $<
+ $(YACC) -d $(YFLAGS) -o y.tab.c $(<:\=/)
sed -e "/^#/s!y\.tab\.h!$(@:.c=.h)!" y.tab.h > $(@:.c=.h).new
@$(MV) $(@:.c=.h).new $(@:.c=.h)
sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index a12eb63..53bcc6e 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -58,7 +58,6 @@ CPP = $(CC) -E
!endif
!if !defined(YACC)
YACC = bison
-YFLAGS = -o y.tab.c
!endif
AR = lib -nologo
PURIFY =