Changed name of compiler to m2

diff --git a/lang/m2/m2mm/m2mm.1 b/lang/m2/m2mm/m2mm.1
index 70b5ebe..91b4205 100644 (file)
--- a/lang/m2/m2mm/m2mm.1
+++ b/lang/m2/m2mm/m2mm.1
@@ -41,7 +41,7 @@ expected to add a library to the \fBLIBS\fP macro, using the \fB-l\fP flag.
 Set \fBM2FLAGS\fP to \fIflags\fP.
 .IP \fB-C\fP\fIcompiler\fP
 Set \fBMOD\fP to \fIcompiler\fP.
-The default value for \fBMOD\fP is "ack" (for the time being).
+The default value for \fBMOD\fP is "m2".
 .IP \fB-l\fP\fIlibrary\fP
 Add \fIlibrary\fP to the \fBLIBS\fP macro. This macro is initially empty,
 and is passed to the loader.

diff --git a/lang/m2/m2mm/main.c b/lang/m2/m2mm/main.c
index fd008c4..cb5d8d6 100644 (file)
--- a/lang/m2/m2mm/main.c
+++ b/lang/m2/m2mm/main.c
@@ -74,7 +74,7 @@ getwdir(fn)
 static struct file_list *arglist;
 
 char *mflags = "";
-char *compiler = "ack";
+char *compiler = "m2";
 char *suff = "o";
 char *llibs = 0;
 
@@ -417,7 +417,7 @@ pr_prog_dep(id, a)
        print("\n\n");
        print("o_files:\t$(OBS_%s)\n\n", id->id_text);
        print("%s:\t$(OBS_%s) $(OBS2_%s)\n", basename(f_filename(a)), id->id_text, id->id_text);
-       print("\t$(MOD) -.mod -o %s $(M2FLAGS) $(OBS_%s) $(OBS2_%s) $(LIBS)\n", basename(f_filename(a)), id->id_text, id->id_text);
+       print("\t$(MOD) -o %s $(M2FLAGS) $(OBS_%s) $(OBS2_%s) $(LIBS)\n", basename(f_filename(a)), id->id_text, id->id_text);
 }
 
 programs()

diff --git a/lang/m2/test/Wirth/makefile b/lang/m2/test/Wirth/makefile
index 4b28e09..659f399 100644 (file)
--- a/lang/m2/test/Wirth/makefile
+++ b/lang/m2/test/Wirth/makefile
@@ -1,26 +1,44 @@
 IFLAGS =
 M2FLAGS = 
-MOD = ack
+MOD = m2
 SUFFIX = o
+LIBS = 
 
 all:   PowersOf2 XREF 
 
-PowersOf2.$(SUFFIX):   PowersOf2.mod /proj/em/Work/lib/m2/InOut.def
-       $(MOD) -c $(M2FLAGS) $(IFLAGS) PowersOf2.mod
-TableHandl.$(SUFFIX):  TableHandl.mod TableHandl.def /proj/em/Work/lib/m2/InOut.def /proj/em/Work/lib/m2/Storage.def
-       $(MOD) -c $(M2FLAGS) $(IFLAGS) TableHandl.mod
-XREF.$(SUFFIX):        XREF.mod /proj/em/Work/lib/m2/InOut.def TableHandl.def
-       $(MOD) -c $(M2FLAGS) $(IFLAGS) XREF.mod
+PowersOf2.$(SUFFIX): \
+       PowersOf2.mod \
+       /proj/em/Work/lib/m2/InOut.def
+       $(MOD) -c.$(SUFFIX) $(M2FLAGS) $(IFLAGS) PowersOf2.mod
+TableHandl.$(SUFFIX): \
+       TableHandl.mod \
+       TableHandl.def \
+       /proj/em/Work/lib/m2/InOut.def \
+       /proj/em/Work/lib/m2/Storage.def
+       $(MOD) -c.$(SUFFIX) $(M2FLAGS) $(IFLAGS) TableHandl.mod
+XREF.$(SUFFIX): \
+       XREF.mod \
+       /proj/em/Work/lib/m2/InOut.def \
+       TableHandl.def
+       $(MOD) -c.$(SUFFIX) $(M2FLAGS) $(IFLAGS) XREF.mod
 
 OBS_PowersOf2 = \
        PowersOf2.$(SUFFIX)
 
-PowersOf2:     $(OBS_PowersOf2)
-       $(MOD) -.mod -o PowersOf2 $(M2FLAGS) $(OBS_PowersOf2)
+OBS2_PowersOf2 =
+
+o_files:       $(OBS_PowersOf2)
+
+PowersOf2:     $(OBS_PowersOf2) $(OBS2_PowersOf2)
+       $(MOD) -o PowersOf2 $(M2FLAGS) $(OBS_PowersOf2) $(OBS2_PowersOf2) $(LIBS)
 
 OBS_XREF = \
-       XREF.$(SUFFIX)\
+       XREF.$(SUFFIX) \
        TableHandl.$(SUFFIX)
 
-XREF:  $(OBS_XREF)
-       $(MOD) -.mod -o XREF $(M2FLAGS) $(OBS_XREF)
+OBS2_XREF =
+
+o_files:       $(OBS_XREF)
+
+XREF:  $(OBS_XREF) $(OBS2_XREF)
+       $(MOD) -o XREF $(M2FLAGS) $(OBS_XREF) $(OBS2_XREF) $(LIBS)