remove INCLUDE option and add Makefile to repository

diff --git a/.gitignore b/.gitignore
index ab45e42ae12d6e9bd57fd63244945ec22e5a0ea6..8877b7df8844a926e4cd929a72ade36b2898b651 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@ Main
 .depends-made
 .cabal-sandbox
 cabal.sandbox.config
-Makefile
+

diff --git a/GNUmakefile b/GNUmakefile
index 956e6dbd2c58d86083028a7f89132079c90a8eb4..68dd6b6226c917e1b894f8c7d3864164de71c8bc 100644 (file)
--- 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 (file)
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 a9180c7e1fdf63ea0b2e78df970c587063391b49..8466c9de5a45767d7e3d84cd8d8b6b3787d7741c 100644 (file)
--- 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