summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile14
-rw-r--r--src/tools/mktoday.sh6
2 files changed, 10 insertions, 10 deletions
diff --git a/src/Makefile b/src/Makefile
index 3ba9d882d..0943b8a16 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,12 +8,10 @@ GHCOPTFLAGS=-O2 $(GHCFLAGS)
GHCFUDFLAG=
JAVAFLAGS=-target 1.4 -source 1.4
-BASICINCLUDE =-iapi -icompile -igrammar -iinfra -ishell -isource -icanonical -iuseGrammar -icf -inewparsing -iparsers -icfgm -ispeech -ivisualization
-
-GHCINCLUDE =-ifor-ghc $(BASICINCLUDE)
-GHCINCLUDENOFUD=-ifor-ghc-nofud $(BASICINCLUDE)
-GHCINCLUDEGFT =-ifor-gft $(BASICINCLUDE)
-WINDOWSINCLUDE =-ifor-windows $(BASICINCLUDE)
+GHCINCLUDE =-ifor-ghc
+GHCINCLUDENOFUD=-ifor-ghc-nofud
+GHCINCLUDEGFT =-ifor-gft
+WINDOWSINCLUDE =-ifor-windows
DIST_DIR=GF-$(PACKAGE_VERSION)
NOT_IN_DIST= \
@@ -100,8 +98,10 @@ distclean: clean
ghci-nofud:
$(GHCI) $(GHCFLAGS) $(GHCINCLUDENOFUD)
+
today:
- util/mktoday.sh
+ tools/mktoday.sh
+
javac:
$(JAVAC) $(JAVAFLAGS) java/*.java
diff --git a/src/tools/mktoday.sh b/src/tools/mktoday.sh
index c563e363b..0f5e6a145 100644
--- a/src/tools/mktoday.sh
+++ b/src/tools/mktoday.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-echo 'module Today (today) where' > Today.hs
-echo 'today :: String' >> Today.hs
-echo 'today = "'`date`'"' >> Today.hs
+echo 'module GF.Today (today) where' > GF/Today.hs
+echo 'today :: String' >> GF/Today.hs
+echo 'today = "'`date`'"' >> GF/Today.hs