added nmclash.c, mods to Makefile/Resolve

This commit is contained in:
ceriel 1986-12-10 15:13:04 +00:00
parent 42162f7b37
commit cb6b68a05f
3 changed files with 18 additions and 11 deletions

View file

@ -1,20 +1,23 @@
# make modula-2 "compiler" # make modula-2 "compiler"
EMDIR = ../../.. EMHOME = ../../..
MHDIR = $(EMDIR)/modules/h MHDIR = $(EMHOME)/modules/h
PKGDIR = $(EMDIR)/modules/pkg PKGDIR = $(EMHOME)/modules/pkg
LIBDIR = $(EMDIR)/modules/lib LIBDIR = $(EMHOME)/modules/lib
OBJECTCODE = $(LIBDIR)/libemk.a OBJECTCODE = $(LIBDIR)/libemk.a
LLGEN = $(EMDIR)/bin/LLgen LLGEN = $(EMHOME)/bin/LLgen
MKDEP = $(EMHOME)/bin/mkdep
PRID = $(EMHOME)/bin/prid
CID = $(EMHOME)/bin/cid
CURRDIR = . CURRDIR = .
INCLUDES = -I$(MHDIR) -I$(EMDIR)/h -I$(PKGDIR) INCLUDES = -I$(MHDIR) -I$(EMHOME)/h -I$(PKGDIR)
GFILES = tokenfile.g program.g declar.g expression.g statement.g GFILES = tokenfile.g program.g declar.g expression.g statement.g
LLGENOPTIONS = LLGENOPTIONS =
PROFILE = PROFILE =
CFLAGS = $(PROFILE) $(INCLUDES) -DSTATIC= CFLAGS = $(PROFILE) $(INCLUDES) -DSTATIC=
LINTFLAGS = -DSTATIC= -DNORCSID LINTFLAGS = -DSTATIC= -DNORCSID
MALLOC = $(LIBDIR)/dickmalloc.o MALLOC = $(LIBDIR)/malloc.o
LFLAGS = $(PROFILE) LFLAGS = $(PROFILE)
LSRC = tokenfile.c program.c declar.c expression.c statement.c LSRC = tokenfile.c program.c declar.c expression.c statement.c
LOBJ = tokenfile.o program.o declar.o expression.o statement.o LOBJ = tokenfile.o program.o declar.o expression.o statement.o
@ -55,7 +58,7 @@ all: Cfiles
@rm -f nmclash.o a.out @rm -f nmclash.o a.out
install: all install: all
cp $(CURRDIR)/main $(EMDIR)/lib/em_m2 cp $(CURRDIR)/main $(EMHOME)/lib/em_m2
clean: clean:
rm -f $(OBJ) $(GENFILES) LLfiles hfiles Cfiles tab clashes $(CURRDIR)/main rm -f $(OBJ) $(GENFILES) LLfiles hfiles Cfiles tab clashes $(CURRDIR)/main
@ -66,7 +69,7 @@ lint: Cfiles
@rm -f nmclash.o a.out @rm -f nmclash.o a.out
longnames: $(SRC) $(HFILES) longnames: $(SRC) $(HFILES)
sh -c 'if test -f longnames ; then prid -l7 longnames $? > Xlongnames ; mv Xlongnames longnames ; else prid -l7 $? > longnames ; fi' sh -c 'if test -f longnames ; then $(PRID) -l7 longnames $? > Xlongnames ; mv Xlongnames longnames ; else $(PRID) -l7 $? > longnames ; fi'
# entry points not to be used directly # entry points not to be used directly
@ -114,7 +117,7 @@ tab:
depend: depend:
sed '/^#AUTOAUTO/,$$d' Makefile > Makefile.new sed '/^#AUTOAUTO/,$$d' Makefile > Makefile.new
echo '#AUTOAUTOAUTOAUTOAUTOAUTOAUTOAUTO' >> Makefile.new echo '#AUTOAUTOAUTOAUTOAUTOAUTOAUTOAUTO' >> Makefile.new
mkdep $(SRC) |\ $(MKDEP) $(SRC) |\
sed 's/\.c:/\.o:/' >> Makefile.new sed 's/\.c:/\.o:/' >> Makefile.new
mv Makefile Makefile.old mv Makefile Makefile.old
mv Makefile.new Makefile mv Makefile.new Makefile

View file

@ -48,7 +48,7 @@ do
cat >> Makefile <<EOF cat >> Makefile <<EOF
$i: clashes $PW/$i $i: clashes $PW/$i
cid -Fclashes < $PW/$i > $i \$(CID) -Fclashes < $PW/$i > $i
EOF EOF
done done
make CURRDIR=$currdir $target make CURRDIR=$currdir $target

4
lang/m2/comp/nmclash.c Normal file
View file

@ -0,0 +1,4 @@
/* Accepted if many characters of long names are significant */
abcdefghijklmnopr() { }
abcdefghijklmnopq() { }
main() { }