Rename gf2 and jgf2 to gf and jgf2

This commit is contained in:
bringert
2004-06-22 15:28:07 +00:00
parent b952c4810b
commit 6cb49d4c65
4 changed files with 28 additions and 27 deletions

View File

@@ -38,18 +38,18 @@ install-java: javac
ln -s ../src/java ../bin ln -s ../src/java ../bin
@echo "PLEASE edit GFHOME in bin/jgf2" @echo "PLEASE edit GFHOME in bin/jgf2"
opt: opt:
$(GHMAKE) $(GHCOPTFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf2 $(GHMAKE) $(GHCOPTFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf
strip gf2 strip gf
mv gf2 ../bin/ mv gf ../bin/
ghc: nofud ghc: nofud
ghci: nofud-links ghci-nofud ghci: nofud-links ghci-nofud
fud: fud:
$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) $(GHCFUDFLAG) GF.hs -o gf2+ $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) $(GHCFUDFLAG) GF.hs -o gf+
strip gf2+ strip gf+
mv gf2+ ../bin/ mv gf+ ../bin/
gft: gft:
$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) -itranslate translate/GFT.hs -o gft $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) -itranslate translate/GFT.hs -o gft
@@ -57,14 +57,14 @@ gft:
mv gft ../bin/ mv gft ../bin/
nofud: nofud-links nofud: nofud-links
$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf2 $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDENOFUD) GF.hs -o gf
strip gf2 strip gf
mv gf2 ../bin/ mv gf ../bin/
justwindows: justwindows:
$(GHMAKE) $(GHCOPTFLAGS) $(WINDOWSINCLUDE) GF.hs -o gf2.exe $(GHMAKE) $(GHCOPTFLAGS) $(WINDOWSINCLUDE) GF.hs -o gf.exe
strip gf2.exe strip gf.exe
mv gf2.exe ../bin/ mv gf.exe ../bin/
nofud-links: nofud-links:
mkdir -p for-ghc-nofud mkdir -p for-ghc-nofud
@@ -73,8 +73,8 @@ nofud-links:
ln -s ../for-hugs/ArchEdit.hs for-ghc-nofud ln -s ../for-hugs/ArchEdit.hs for-ghc-nofud
batch: batch:
$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) GF2.hs -o gf2 $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) GF2.hs -o gf
strip gf2 strip gf
api: api:
$(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) API.hs $(GHMAKE) $(GHCFLAGS) $(GHCINCLUDE) API.hs
@@ -86,7 +86,8 @@ clean:
distclean: clean distclean: clean
-rm -f for-ghc-nofud/*.hs -rm -f for-ghc-nofud/*.hs
-rm -f java/gf-java.jar jgf2 -rm -f java/gf-java.jar jgf
-rm -f util/gfdoc
-rm -f config.status config.mk config.log -rm -f config.status config.mk config.log
-rm -f *.tar.gz *.zip -rm -f *.tar.gz *.zip
@@ -107,9 +108,9 @@ help:
# added by peb: # added by peb:
tracing: tracing:
$(GHMAKE) $(GHCFLAGS) -itrace $(GHCINCLUDENOFUD) GF.hs -o gf2 $(GHMAKE) $(GHCFLAGS) -itrace $(GHCINCLUDENOFUD) GF.hs -o gf
strip gf2 strip gf
mv gf2 ../bin/ mv gf ../bin/
dist: dist:
-rm -rf $(DIST_DIR) -rm -rf $(DIST_DIR)
@@ -125,9 +126,9 @@ dist:
rpm: dist rpm: dist
rpmbuild -ta $(DIST_DIR).tar.gz rpmbuild -ta $(DIST_DIR).tar.gz
install-gf2: install-gf:
$(INSTALL) -d $(bindir) $(INSTALL) -d $(bindir)
$(INSTALL) ../bin/gf2 $(bindir) $(INSTALL) ../bin/gf $(bindir)
install-gfdoc: install-gfdoc:
$(INSTALL) -d $(bindir) $(INSTALL) -d $(bindir)
@@ -135,10 +136,10 @@ install-gfdoc:
install-editor: install-editor:
$(INSTALL) -d $(libdir)/GF-$(PACKAGE_VERSION) $(INSTALL) -d $(libdir)/GF-$(PACKAGE_VERSION)
$(INSTALL) jgf2 $(bindir) $(INSTALL) jgf $(bindir)
$(INSTALL) java/gf-java.jar $(libdir)/GF-$(PACKAGE_VERSION) $(INSTALL) java/gf-java.jar $(libdir)/GF-$(PACKAGE_VERSION)
install: install-gf2 install-gfdoc install-editor install: install-gf install-gfdoc install-editor
gfdoc: gfdoc:
cd util ; $(GHMAKE) GFDoc.hs -o gfdoc ; cd .. cd util ; $(GHMAKE) GFDoc.hs -o gfdoc ; cd ..

View File

@@ -1,12 +1,12 @@
dnl Run autoconf to generate configure from this file dnl Run autoconf to generate configure from this file
AC_INIT([GF],[2.0],[dp03-7@mdstud.chalmers.se],[GF]) AC_INIT([GF],[2.0],[aarne@cs.chalmers.se],[GF])
AC_PREREQ(2.53) AC_PREREQ(2.53)
AC_REVISION($Revision: 1.2 $) AC_REVISION($Revision: 1.3 $)
AC_CONFIG_FILES([config.mk jgf2]) AC_CONFIG_FILES([config.mk jgf])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM

View File

@@ -58,9 +58,9 @@ cd src
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%{_bindir}/gf2 %{_bindir}/gf
%{_bindir}/gfdoc %{_bindir}/gfdoc
%{_bindir}/jgf2 %{_bindir}/jgf
%{_libdir}/%{name}-%{version}/gf-java.jar %{_libdir}/%{name}-%{version}/gf-java.jar
%doc LICENSE README doc/{DocGF.pdf,gf2-highlights.html,index.html} %doc LICENSE README doc/{DocGF.pdf,gf2-highlights.html,index.html}