summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorbringert <unknown>2005-05-19 17:19:42 +0000
committerbringert <unknown>2005-05-19 17:19:42 +0000
commit138ac2dece6cbd62b93127ce87e630781ef0188a (patch)
tree0b54e4b832b26f1b82c02ee5a99379b3b91343d3 /src/Makefile
parentc2ac91bc1695d84b4eeb35c467f4c9ac0bea8327 (diff)
Clean target now works in cygwin. Quoted paths to java executables to handle spaces in paths. Include more files in the MSI package. Disable readline automatically on GHC 6.4 for Windows.
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index eecb0f6df..6667bfbe8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -89,8 +89,7 @@ shell:
$(GHMAKE) $(GHCFLAGS) $(GHCOPTFLAGS) 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}
+ find . '(' -name '*~' -o -name '*.hi' -o -name '*.ghi' -o -name '*.o' ')' -exec rm -f '{}' ';'
-rm -f JavaGUI/*.class
-rm -f gf.wixobj
@@ -203,7 +202,10 @@ grammar-dist:
gtar -zcf $(GRAMMAR_DIST_DIR).tgz $(GRAMMAR_DIST_DIR)
rm -rf $(GRAMMAR_DIST_DIR)
-windows-msi:
+jgf.bat:
+ echo 'java -jar gf-java.jar gf.exe' > jgf.bat
+
+windows-msi: jgf.bat
candle -nologo gf.wxs
light -nologo gf.wixobj