From 0ace0707b9c772948a5fec4f5435b5e521ac8c81 Mon Sep 17 00:00:00 2001 From: "Daniel R. Grayson" Date: Fri, 23 Oct 2015 13:06:22 -0400 Subject: [PATCH] remove INCLUDE option and add Makefile to repository --- .gitignore | 2 +- GNUmakefile | 11 ++++------- Makefile | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 +- 4 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 Makefile diff --git a/.gitignore b/.gitignore index ab45e42..8877b7d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,4 @@ Main .depends-made .cabal-sandbox cabal.sandbox.config -Makefile + diff --git a/GNUmakefile b/GNUmakefile index 956e6db..68dd6b6 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -28,16 +28,13 @@ all: cubical # cubical: $(INPUT:.hs=.o) $(GRAMMAR_OBJECT_FILES); $(GHC) -o $@ $(GHCOPTIONS) $^ cubical: $(INPUT:.hs=.o) $(GRAMMAR_OBJECT_FILES) + $(GHC) -M $(INPUT) $(GRAMMAR_HS_FILES) $(GHC) --make $(GHCOPTIONS) -o cubical Main -depends: Makefile -Makefile: $(INPUT) $(GRAMMAR_HS_FILES) +build-Makefile: $(INPUT) $(GRAMMAR_HS_FILES) $(GHC) -M $^ - @ touch $@ -INCLUDE=yes -ifeq ($(INCLUDE),yes) + include Makefile -endif %.hi %.o: %.hs $(GHC) $(GHCOPTIONS) $< @ touch $*.hi $*.o @@ -52,5 +49,5 @@ run-bnfc $(GRAMMAR_FILES): Exp.cf TAGS:; hasktags --etags $(INPUT) $(GRAMMAR) -clean:; rm -rf Exp *.log *.aux *.hi *.o cubical TAGS Makefile Makefile.bak +clean:; rm -rf Exp *.log *.aux *.hi *.o cubical TAGS Makefile.bak git-clean:; git clean -Xdfq diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..23767e5 --- /dev/null +++ b/Makefile @@ -0,0 +1,51 @@ +# DO NOT DELETE: Beginning of Haskell dependencies +Exp/ErrM.o : Exp/ErrM.hs +Exp/Abs.o : Exp/Abs.hs +Exp/Skel.o : Exp/Skel.hs +Exp/Skel.o : Exp/ErrM.hi +Exp/Skel.o : Exp/Abs.hi +Exp/Print.o : Exp/Print.hs +Exp/Print.o : Exp/Abs.hi +Exp/Lex.o : Exp/Lex.hs +Exp/Par.o : Exp/Par.hs +Exp/Par.o : Exp/ErrM.hi +Exp/Par.o : Exp/Lex.hi +Exp/Par.o : Exp/Abs.hi +Exp/Layout.o : Exp/Layout.hs +Exp/Layout.o : Exp/Lex.hi +Exp/Test.o : Exp/Test.hs +Exp/Test.o : Exp/ErrM.hi +Exp/Test.o : Exp/Layout.hi +Exp/Test.o : Exp/Abs.hi +Exp/Test.o : Exp/Print.hi +Exp/Test.o : Exp/Skel.hi +Exp/Test.o : Exp/Par.hi +Exp/Test.o : Exp/Lex.hi +Connections.o : Connections.hs +CTT.o : CTT.hs +CTT.o : Connections.hi +Eval.o : Eval.hs +Eval.o : CTT.hi +Eval.o : Connections.hi +Resolver.o : Resolver.hs +Resolver.o : Connections.hi +Resolver.o : Connections.hi +Resolver.o : CTT.hi +Resolver.o : CTT.hi +Resolver.o : Exp/Abs.hi +TypeChecker.o : TypeChecker.hs +TypeChecker.o : Eval.hi +TypeChecker.o : CTT.hi +TypeChecker.o : Connections.hi +Main.o : Main.hs +Main.o : Eval.hi +Main.o : TypeChecker.hi +Main.o : Resolver.hi +Main.o : CTT.hi +Main.o : Exp/ErrM.hi +Main.o : Exp/Layout.hi +Main.o : Exp/Abs.hi +Main.o : Exp/Print.hi +Main.o : Exp/Par.hi +Main.o : Exp/Lex.hi +# DO NOT DELETE: End of Haskell dependencies diff --git a/README.md b/README.md index a9180c7..8466c9d 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ This assumes that ```hasktags``` has been installed. To clean up, run: ```sh - make clean INCLUDE=no + make clean ``` Usage -- 2.34.1