From 138ac2dece6cbd62b93127ce87e630781ef0188a Mon Sep 17 00:00:00 2001 From: bringert Date: Thu, 19 May 2005 17:19:42 +0000 Subject: 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. --- src/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Makefile') 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 -- cgit v1.2.3