A bunch of Makefile fixes. Moved HelpFile and HelpFile.hs.

src/Makefile

@@ -23,7 +23,10 @@ BIN_DIST_DIR=$(DIST_DIR)-$(host)
 
 SNAPSHOT_DIR=GF-$(shell date +%Y%m%d)
 
-all: unix gfdoc jar
+.PHONY: all install install-gf install-gfdoc install-editor \
+        today help clean
+
+all: unix tools/gfdoc jar
 
 temp: today touch-files noopt
 
@@ -74,9 +77,11 @@ nofud-links:
 	ln -s ../for-ghc/Arch.hs for-ghc-nofud
 
 api: 
-	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) API.hs
+	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) GF/API.hs
+
 shell: 
-	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) Shell.hs
+	$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) GF/Shell.hs
+
 clean: 
 	-rm -rf */*.o */*.hi *.o *.hi */*.ghi *.ghi *~ */*~
 	-rm -f GF/*.{o,hi,ghi} GF/*/*.{o,hi,ghi} GF/*/*/*.{o,hi,ghi}
@@ -85,7 +90,7 @@ clean:
 distclean: clean
 	-rm -f for-ghc-nofud/*.hs
 	-rm -f java/gf-java.jar jgf
-	-rm -f util/gfdoc
+	-rm -f tools/gfdoc
 	-rm -f config.status config.mk config.log
 	-rm -f *.tgz *.zip
 	-rm -rf $(DIST_DIR) $(BIN_DIST_DIR)
@@ -102,8 +107,11 @@ javac:
 jar: javac
 	cd java; $(JAR) -cmf manifest.txt gf-java.jar *.class
 
-help:
-	cd util ; runhugs MkHelpFile ; mv HelpFile.hs .. ; cd ..
+tools/MkHelpFile: tools/MkHelpFile.hs
+	$(GHMAKE) -o $@ $^
+
+help: tools/MkHelpFile
+	tools/MkHelpFile
 
 # added by peb:
 tracing: GHCFLAGS += -DTRACING
@@ -144,8 +152,8 @@ binary-dist:
 	rm -rf $(BIN_DIST_DIR)
 	mkdir $(BIN_DIST_DIR)
 	./configure --host="$(host)" CPPFLAGS="`lib__readline -I` `lib__ncurses -I`" LDFLAGS="`lib__readline -l` `lib__ncurses -l`"
-	$(MAKE) unix gfdoc jar
-	$(INSTALL) ../bin/gf util/gfdoc $(BIN_DIST_DIR)
+	$(MAKE) all
+	$(INSTALL) ../bin/gf tools/gfdoc $(BIN_DIST_DIR)
 	$(INSTALL) -m 0644 java/gf-java.jar $(BIN_DIST_DIR)
 	$(INSTALL) configure config.guess config.sub install-sh $(BIN_DIST_DIR)
 	$(INSTALL) -m 0644 config.mk.in jgf.in $(BIN_DIST_DIR)
@@ -155,20 +163,20 @@ binary-dist:
 	gtar -zcf GF-$(PACKAGE_VERSION)-$(host).tgz $(BIN_DIST_DIR)
 	rm -rf $(BIN_DIST_DIR)
 
+install: install-gf install-gfdoc install-editor
+
 install-gf:
 	$(INSTALL) -d $(bindir)
 	$(INSTALL) ../bin/gf $(bindir)
 
 install-gfdoc: 
 	$(INSTALL) -d $(bindir)
-	$(INSTALL) util/gfdoc $(bindir)
+	$(INSTALL) tools/gfdoc $(bindir)
 
 install-editor:
 	$(INSTALL) -d $(datadir)/GF-$(PACKAGE_VERSION)
 	$(INSTALL) jgf $(bindir)
 	$(INSTALL) -m 0644 java/gf-java.jar $(datadir)/GF-$(PACKAGE_VERSION)
 
-install: install-gf install-gfdoc install-editor
-
-gfdoc:
-	cd util ; $(GHMAKE) GFDoc.hs -o gfdoc ; cd ..
+tools/gfdoc: tools/GFDoc.hs
+	$(GHMAKE) -o $@ $^