diff --git a/ChangeLog b/ChangeLog index 5483ca0f72..b877f1fa59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Aug 13 23:42:49 2008 Nobuyoshi Nakada + + * common.mk (parse.h): fake rule. + Wed Aug 13 23:15:58 2008 Shugo Maeda * test/ruby/test_thread.rb (test_list): call Thread.pass to run t1. diff --git a/common.mk b/common.mk index 7f6eb193af..3f973054bc 100644 --- a/common.mk +++ b/common.mk @@ -2,7 +2,7 @@ bin: $(PROGRAM) $(WPROGRAM) lib: $(LIBRUBY) dll: $(LIBRUBY_SO) -.SUFFIXES: .inc +.SUFFIXES: .inc .h .c .y RUBYLIB = - RUBYOPT = - @@ -390,13 +390,16 @@ 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.c: {$(VPATH)}parse.h +parse.h: + @$(NULLCMD) {$(srcdir)}.y.c: $(YACC) -d $(YFLAGS) -o y.tab.c $< - sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new - @$(MV) $@.new $@ 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 + @$(MV) $@.new $@ @$(RM) y.tab.c y.tab.h acosh.$(OBJEXT): {$(VPATH)}acosh.c @@ -431,6 +434,7 @@ win32.$(OBJEXT): {$(VPATH)}win32.c RUBY_H_INCLUDES = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \ {$(VPATH)}intern.h {$(VPATH)}missing.h +ID_H_INCLUDES = {$(VPATH)}id.h {$(VPATH)}parse.h array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}util.h @@ -461,19 +465,19 @@ enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}debug.h {$(VPATH)}node.h error.$(OBJEXT): {$(VPATH)}error.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h {$(VPATH)}node.h \ - {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}debug.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h \ $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \ {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \ - {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}debug.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h \ {$(VPATH)}eval_error.c {$(VPATH)}eval_safe.c \ {$(VPATH)}eval_jump.c load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \ $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \ {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \ - {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}debug.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h file.$(OBJEXT): {$(VPATH)}file.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}io.h {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h \ @@ -482,7 +486,7 @@ gc.$(OBJEXT): {$(VPATH)}gc.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}signal.h {$(VPATH)}node.h {$(VPATH)}re.h \ {$(VPATH)}regex.h {$(VPATH)}oniguruma.h {$(VPATH)}io.h \ {$(VPATH)}encoding.h {$(VPATH)}vm_core.h {$(VPATH)}debug.h \ - {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h \ {$(VPATH)}gc.h {$(VPATH)}eval_intern.h hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) \ @@ -508,19 +512,19 @@ object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) \ pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}parse.y $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}encoding.h \ - {$(VPATH)}oniguruma.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}oniguruma.h $(ID_H_INCLUDES) \ {$(VPATH)}regenc.h {$(VPATH)}regex.h {$(VPATH)}util.h \ {$(VPATH)}lex.c {$(VPATH)}keywords {$(VPATH)}debug.h prec.$(OBJEXT): {$(VPATH)}prec.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \ $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \ {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \ - {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}debug.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h {$(VPATH)}gc.h process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \ {$(VPATH)}signal.h {$(VPATH)}vm_core.h {$(VPATH)}util.h \ {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h @@ -554,11 +558,11 @@ ruby.$(OBJEXT): {$(VPATH)}ruby.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}encoding.h \ {$(VPATH)}oniguruma.h {$(VPATH)}eval_intern.h {$(VPATH)}util.h \ {$(VPATH)}signal.h {$(VPATH)}vm_core.h {$(VPATH)}debug.h \ - {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}signal.h {$(VPATH)}node.h {$(VPATH)}vm_core.h \ - {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}debug.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \ {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \ @@ -573,14 +577,14 @@ struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) \ thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \ $(RUBY_H_INCLUDES) {$(VPATH)}st.h {$(VPATH)}node.h \ {$(VPATH)}util.h {$(VPATH)}signal.h {$(VPATH)}vm_core.h \ - {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}debug.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h {$(VPATH)}vm.h \ {$(VPATH)}gc.h {$(VPATH)}thread_$(THREAD_MODEL).c transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \ {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h {$(VPATH)}transcode_data.h cont.$(OBJEXT): {$(VPATH)}cont.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h {$(VPATH)}node.h \ - {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}debug.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}gc.h \ {$(VPATH)}eval_intern.h {$(VPATH)}util.h {$(VPATH)}dln.h time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \ @@ -595,13 +599,13 @@ version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \ compile.$(OBJEXT): {$(VPATH)}compile.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \ {$(VPATH)}node.h {$(VPATH)}vm_core.h \ {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}compile.h \ {$(VPATH)}insns.inc {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc iseq.$(OBJEXT): {$(VPATH)}iseq.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}gc.h {$(VPATH)}vm_core.h \ {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}insns.inc \ {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc vm.$(OBJEXT): {$(VPATH)}vm.c $(RUBY_H_INCLUDES) \ @@ -609,7 +613,7 @@ vm.$(OBJEXT): {$(VPATH)}vm.c $(RUBY_H_INCLUDES) \ {$(VPATH)}oniguruma.h {$(VPATH)}gc.h {$(VPATH)}insnhelper.h \ {$(VPATH)}eval_intern.h {$(VPATH)}util.h {$(VPATH)}signal.h \ {$(VPATH)}vm_core.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}dln.h {$(VPATH)}vm.h \ {$(VPATH)}vm_insnhelper.c {$(VPATH)}insns.inc {$(VPATH)}vm_evalbody.c \ {$(VPATH)}vmtc.inc {$(VPATH)}vm.inc {$(VPATH)}insns.def \ @@ -617,34 +621,34 @@ vm.$(OBJEXT): {$(VPATH)}vm.c $(RUBY_H_INCLUDES) \ vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \ {$(VPATH)}node.h {$(VPATH)}vm_core.h \ {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}vm.h debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h \ {$(VPATH)}debug.h {$(VPATH)}node.h {$(VPATH)}vm_core.h \ - {$(VPATH)}signal.h {$(VPATH)}vm_opts.h {$(VPATH)}id.h {$(VPATH)}parse.c \ + {$(VPATH)}signal.h {$(VPATH)}vm_opts.h $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}node.h {$(VPATH)}vm_core.h \ {$(VPATH)}signal.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) \ - {$(VPATH)}st.h {$(VPATH)}id.h {$(VPATH)}parse.c + {$(VPATH)}st.h $(ID_H_INCLUDES) miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h \ {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h \ {$(VPATH)}vm_core.h {$(VPATH)}signal.h \ {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \ {$(VPATH)}st.h {$(VPATH)}vm_core.h {$(VPATH)}signal.h \ {$(VPATH)}node.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \ - {$(VPATH)}id.h {$(VPATH)}parse.c \ + $(ID_H_INCLUDES) \ {$(VPATH)}thread_$(THREAD_MODEL).h goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}st.h