2010-06-29 Basile Starynkevitch <basile@starynkevitch.net>

	* melt-make.mk: replaced run-melt.h by melt-run.h everywhere.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@161517 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 24 insertions, 21 deletions

diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT
index 9cebbec1008..057c28f62fa 100644
--- a/gcc/ChangeLog.MELT
+++ b/gcc/ChangeLog.MELT
@@ -1,5 +1,8 @@
 
 2010-06-29  Basile Starynkevitch  <basile@starynkevitch.net>
+	* melt-make.mk: replaced run-melt.h by melt-run.h everywhere.
+
+2010-06-29  Basile Starynkevitch  <basile@starynkevitch.net>
 
 	* Makefile.in (MELT_OBJ): removed definition, use melt-runtime.o.
 	(melt-run-md5.h): Added its generation.
diff --git a/gcc/melt-make.mk b/gcc/melt-make.mk
index 574b7d61105..81c275c1883 100644
--- a/gcc/melt-make.mk
+++ b/gcc/melt-make.mk
@@ -75,13 +75,13 @@ vpath %.melt $(melt_make_source_dir) . $(melt_source_dir)
 ## the invoking command could set MELT_MAKE_MODULE_XTRAMAKEFLAGS=-j2
 MELT_MAKE_MODULE=$(MAKE) -f $(melt_make_module_makefile) $(MELT_MAKE_MODULE_XTRAMAKEFLAGS) VPATH=$(VPATH):.
 
-warmelt-%.0.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h run-melt.h \
+warmelt-%.0.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h melt-run.h \
                 melt-runtime.h melt-runtime.c cc1$(exeext)
 	echo in melt-make.mk melt_cflags= $(melt_cflags) 
 	$(MELT_MAKE_MODULE) melt_module \
 	      GCCMELT_CFLAGS="$(melt_cflags)" \
 	      GCCMELT_MODULE_SOURCE=$< GCCMELT_MODULE_BINARY=$@
-warmelt-%.0.d.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h  run-melt.h cc1$(exeext)
+warmelt-%.0.d.so: warmelt-%.0.c $(melt_make_module_makefile) melt-predef.h  melt-run.h cc1$(exeext)
 	$(MELT_MAKE_MODULE) melt_module_dynamic \
 	      GCCMELT_CFLAGS="$(melt_cflags)" \
 	      GCCMELT_MODULE_SOURCE=$< GCCMELT_MODULE_BINARY=$(shell basename $@ .d.so).so
@@ -185,7 +185,7 @@ WARMELT_BASEC= $(patsubst %, %.c, $(WARMELT_BASE))
 WARMELT_BASEROW:=$(shell echo $(WARMELT_BASE)|sed 's/ /:/g')
 
 ## force a dependency
-$(WARMELT_BASE0SO): empty-file-for-melt.c run-melt.h melt-runtime.h
+$(WARMELT_BASE0SO): empty-file-for-melt.c melt-run.h melt-runtime.h
 
 .PHONY: warmelt1 warmelt2 warmelt warmelt1n warmelt2n
 
@@ -239,7 +239,7 @@ empty-file-for-melt.c:
 	date +"/* empty-file-for-melt.c %c */" > $@-tmp
 	$(melt_make_move) $@-tmp $@
 
-warmelt-first.1.c: $(melt_make_source_dir)/warmelt-first.melt warmelt0.modlis $(melt_make_gencdeps)  $(WARMELT_BASE0SO) empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+warmelt-first.1.c: $(melt_make_source_dir)/warmelt-first.melt warmelt0.modlis $(melt_make_gencdeps)  $(WARMELT_BASE0SO) empty-file-for-melt.c melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCINIT1) $(meltarg_init)=$(WARMELT_BASE0ROW) \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24) \
 	      $(meltarg_output)=$@  empty-file-for-melt.c
@@ -287,17 +287,17 @@ warmelt-%-h2.c: $(melt_make_source_dir)/warmelt-%.melt $(melt_make_gencdeps) \
 ## compiled without any optimisation, otherwise the C compiler suffers
 ## too much..
 
-warmeltbig.1.c: $(WARMELT_SRCFILES) warmelt0.modlis $(melt_make_gencdeps)  $(WARMELT_BASE0SO)  warmelt-predef.melt  empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+warmeltbig.1.c: $(WARMELT_SRCFILES) warmelt0.modlis $(melt_make_gencdeps)  $(WARMELT_BASE0SO)  warmelt-predef.melt  empty-file-for-melt.c melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCINIT1) $(meltarg_init)=$(WARMELT_BASE0ROW) \
 	      $(meltarg_arglist)=$(WARMELT_SRCARGLIST) \
 	      $(meltarg_output)=$@  empty-file-for-melt.c
 
-warmeltbig.2.c: $(WARMELT_SRCFILES) warmeltbig.1.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES)  empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+warmeltbig.2.c: $(WARMELT_SRCFILES) warmeltbig.1.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES)  empty-file-for-melt.c melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCINIT1) $(meltarg_init)=warmeltbig.1 \
 	      $(meltarg_arglist)=$(WARMELT_SRCARGLIST) \
 	      $(meltarg_output)=$@  empty-file-for-melt.c
 
-warmeltbig.3.c: $(WARMELT_SRCFILES) warmeltbig.2.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES)  empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+warmeltbig.3.c: $(WARMELT_SRCFILES) warmeltbig.2.so $(melt_make_gencdeps) empty-file-for-melt.c warmelt-predef.melt $(WARMELT_SRCFILES)  empty-file-for-melt.c melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCINIT1) $(meltarg_init)=warmeltbig.2 \
 	      $(meltarg_arglist)=$(WARMELT_SRCARGLIST) \
 	      $(meltarg_output)=$@  empty-file-for-melt.c
@@ -336,7 +336,7 @@ warmelt-base.1.c: $(melt_make_source_dir)/warmelt-base.melt $(melt_make_gencdeps
       warmelt-normatch.0.d.so \
       warmelt-genobj.0.d.so \
       warmelt-outobj.0.d.so \
-      empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) 
+      empty-file-for-melt.c melt-predef.h melt-run.h melt-runtime.h cc1$(exeext) 
 	$(MELTCCFILE1) \
 	$(meltarg_init)=warmelt-first.1:warmelt-base.0.d:warmelt-debug.0.d:warmelt-macro.0.d:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24) \
@@ -351,7 +351,7 @@ warmelt-debug.1.c: $(melt_make_source_dir)/warmelt-debug.melt $(melt_make_gencde
       warmelt-normatch.0.d.so \
       warmelt-genobj.0.d.so \
       warmelt-outobj.0.d.so \
-      empty-file-for-melt.c melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) 
+      empty-file-for-melt.c melt-predef.h melt-run.h melt-runtime.h cc1$(exeext) 
 	$(MELTCCFILE1) \
 	$(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.0.d:warmelt-macro.0.d:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24) \
@@ -367,7 +367,7 @@ warmelt-macro.1.c: $(melt_make_source_dir)/warmelt-macro.melt $(melt_make_gencde
      warmelt-normatch.0.d.so \
      warmelt-genobj.0.d.so \
      warmelt-outobj.0.d.so \
-     empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) 
+     empty-file-for-melt.c warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext) 
 	$(MELTCCFILE1) \
 	$(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.0.d:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24) \
@@ -383,7 +383,7 @@ warmelt-normal.1.c: $(melt_make_source_dir)/warmelt-normal.melt $(melt_make_genc
     warmelt-normatch.0.d.so \
     warmelt-genobj.0.d.so \
     warmelt-outobj.0.d.so \
-    empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext) 
+    empty-file-for-melt.c warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext) 
 	$(MELTCCFILE1) \
 	$(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.0.d:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24) \
@@ -399,7 +399,7 @@ warmelt-normatch.1.c: $(melt_make_source_dir)/warmelt-normatch.melt $(melt_make_
     warmelt-normatch.0.d.so \
     warmelt-genobj.0.d.so \
     warmelt-outobj.0.d.so \
-    empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+    empty-file-for-melt.c warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCFILE1) \
 	$(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.1:warmelt-normatch.0.d:warmelt-genobj.0.d:warmelt-outobj.0.d \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24) \
@@ -414,7 +414,7 @@ warmelt-genobj.1.c: $(melt_make_source_dir)/warmelt-genobj.melt $(melt_make_genc
     warmelt-normatch.1.so \
     warmelt-genobj.0.d.so \
     warmelt-outobj.0.d.so \
-    empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+    empty-file-for-melt.c warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCFILE1) \
 	$(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.1:warmelt-normatch.1:warmelt-genobj.0.d:warmelt-outobj.0.d \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24)\
@@ -429,7 +429,7 @@ warmelt-outobj.1.c: $(melt_make_source_dir)/warmelt-outobj.melt $(melt_make_genc
     warmelt-normatch.1.so \
     warmelt-genobj.1.so \
     warmelt-outobj.0.d.so \
-    empty-file-for-melt.c warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+    empty-file-for-melt.c warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCFILE1) \
 	$(meltarg_init)=warmelt-first.1:warmelt-base.1:warmelt-debug.1:warmelt-macro.1:warmelt-normal.1:warmelt-normatch.1:warmelt-genobj.1:warmelt-outobj.0.d \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24)\
@@ -448,7 +448,7 @@ warmelt2n.modlis: $(WARMELT_BASE2NSO)
 	$(melt_make_move) $@-tmp $@
 
 warmelt-first.2.c: $(melt_make_source_dir)/warmelt-first.melt warmelt1.modlis $(WARMELT_BASE1SO) $(melt_make_gencdeps) \
-  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCINIT1) $(meltarg_init)="@warmelt1" \
 	      $(meltarg_arg)=$<  -frandom-seed=$(shell md5sum $< | cut -b-24) \
 	      $(meltarg_output)=$@ empty-file-for-melt.c
@@ -456,7 +456,7 @@ warmelt-first.2.c: $(melt_make_source_dir)/warmelt-first.melt warmelt1.modlis $(
 
 
 warmelt-%.2.c: $(melt_make_source_dir)/warmelt-%.melt warmelt1.modlis $(WARMELT_BASE1SO)  $(melt_make_gencdeps) \
-  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	$(MELTCCFILE1) $(meltarg_init)="@warmelt1" \
 	        -frandom-seed=$(shell md5sum $< | cut -b-24) \
 	      $(meltarg_arg)=$< \
@@ -497,7 +497,7 @@ warmelt-outobj.so: warmelt-outobj.c
 
 ####
 warmelt-%.c: $(melt_make_source_dir)/warmelt-%.melt  warmelt2.modlis $(WARMELT_BASE2SO)  $(melt_make_gencdeps) \
-  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	@echo generating $@ using $(WARMELT_BASE2SO)
 	-rm -f $@
 	$(MELTCCFILE1) $(meltarg_init)="@warmelt2" \
@@ -510,7 +510,7 @@ warmelt.modlis: $(WARMELT_BASE2SO)
 	$(SHELL) $(srcdir)/../move-if-change $@-tmp $@
 
 warmelt-first.c: $(melt_make_source_dir)/warmelt-first.melt warmelt2.modlis $(WARMELT_BASE2SO) $(melt_make_gencdeps) \
-  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	-rm -f $@ 
 	@echo generating $@ using $(WARMELT_BASE2SO)
 	$(MELTCCINIT1) $(meltarg_init)="@warmelt2" \
@@ -529,7 +529,7 @@ diff-warmelt.2.: $(WARMELT_BASESO)
 
 ####
 xtramelt-ana-base.c: $(melt_make_source_dir)/xtramelt-ana-base.melt  warmelt2.modlis $(WARMELT_BASE2SO)  $(melt_make_gencdeps) \
-  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	@echo generating $@ using $(WARMELT_BASE2SO)
 	-rm -f $@
 	$(MELTCCFILE1) $(meltarg_init)="@warmelt2" \
@@ -538,7 +538,7 @@ xtramelt-ana-base.c: $(melt_make_source_dir)/xtramelt-ana-base.melt  warmelt2.mo
 	ls -l $@
 
 xtramelt-ana-simple.c:  $(melt_make_source_dir)/xtramelt-ana-simple.melt  warmelt2.modlis $(WARMELT_BASE2SO)  xtramelt-ana-base.so   $(melt_make_gencdeps)  \
-  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	@echo generating $@ using $(WARMELT_BASE2SO)
 	-rm -f $@
 	$(MELTCCFILE1) $(meltarg_init)="@warmelt2:xtramelt-ana-base" \
@@ -547,7 +547,7 @@ xtramelt-ana-simple.c:  $(melt_make_source_dir)/xtramelt-ana-simple.melt  warmel
 	ls -l $@
 
 xtramelt-parse-infix-syntax.c:  $(melt_make_source_dir)/xtramelt-parse-infix-syntax.melt  warmelt2.modlis $(WARMELT_BASE2SO)  xtramelt-ana-base.so xtramelt-ana-simple.so  $(melt_make_gencdeps)  \
-  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h run-melt.h melt-runtime.h cc1$(exeext)
+  empty-file-for-melt.c  warmelt-predef.melt melt-predef.h melt-run.h melt-runtime.h cc1$(exeext)
 	@echo generating $@ using $(WARMELT_BASE2SO)
 	-rm -f $@
 	$(MELTCCFILE1) $(meltarg_init)="@warmelt2:xtramelt-ana-base:xtramelt-ana-simple" \