diff options
| -rw-r--r-- | src/Makefile | 20 | ||||
| -rw-r--r-- | src/Makefile.binary | 2 | ||||
| -rw-r--r-- | src/configure.ac | 2 | ||||
| -rw-r--r-- | src/gfeditor.in | 42 | ||||
| -rw-r--r-- | src/jgf.bat | 1 | ||||
| -rw-r--r-- | src/jgf.in | 42 |
6 files changed, 4 insertions, 105 deletions
diff --git a/src/Makefile b/src/Makefile index 07e2a5e07..af69af950 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,8 +6,6 @@ GHCXMAKE=ghcxmake GHCFLAGS+= -fglasgow-exts GHCOPTFLAGS=-O2 GHCFUDFLAG= -JAVAFLAGS=-target 1.4 -source 1.4 -GFEDITOR=JavaGUI2 DIST_DIR=GF-$(PACKAGE_VERSION) NOT_IN_DIST= \ @@ -62,7 +60,7 @@ else endif .PHONY: all unix jar tags gfdoc windows install install-gf \ - lib temp install-gfdoc install-editor \ + lib temp install-gfdoc \ today help clean windows-msi dist gfc all: unix gfc lib @@ -236,7 +234,7 @@ windows-msi: gf.wxs # Installation # -install: install-gf install-gfdoc install-lib install-editor +install: install-gf install-gfdoc install-lib install-gf: $(INSTALL) -d $(bindir) @@ -249,17 +247,3 @@ install-gfdoc: install-lib: $(INSTALL) -d $(GF_LIB_DIR) $(TAR) -C $(GF_LIB_DIR) -zxf ../lib/compiled.tgz - -install-editor: - $(INSTALL) -d $(GF_DATA_DIR) - $(INSTALL) jgf $(bindir) - $(INSTALL) -m 0644 JavaGUI/gf-java.jar $(GF_DATA_DIR) - $(INSTALL) gfeditor $(bindir) - $(INSTALL) -m 0644 $(GFEDITOR)/gfeditor.jar $(GF_DATA_DIR) - -install-java: - -rm -f ../bin/JavaGUI - ln -s ../src/JavaGUI ../bin - @echo "PLEASE set GFHOME and GF_LIB_PATH in your environment" - -rm -f ../bin/$(GFEDITOR) - ln -s ../src/$(GFEDITOR) ../bin diff --git a/src/Makefile.binary b/src/Makefile.binary index a97c8fee5..9eb62c382 100644 --- a/src/Makefile.binary +++ b/src/Makefile.binary @@ -12,7 +12,7 @@ install: cp -r lib $(GF_DATA_DIR) uninstall: - -rm -f $(bindir)/gf$(EXEEXT) $(bindir)/gfdoc$(EXEEXT) $(bindir)/gfeditor + -rm -f $(bindir)/gf$(EXEEXT) $(bindir)/gfdoc$(EXEEXT) -rm -f $GF_LIB_DIR)/*/*.gf{o} -rmdir $(GF_LIB_DIR)/* -rmdir $(GF_LIB_DIR) diff --git a/src/configure.ac b/src/configure.ac index 3a02e0945..dfaa28b7e 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -6,7 +6,7 @@ AC_PREREQ(2.53) AC_REVISION($Revision: 1.26 $) -AC_CONFIG_FILES([config.mk gfc jgf gfeditor]) +AC_CONFIG_FILES([config.mk gfc]) AC_CANONICAL_HOST diff --git a/src/gfeditor.in b/src/gfeditor.in deleted file mode 100644 index 129cd5e1f..000000000 --- a/src/gfeditor.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -prefix="@prefix@" - -case "@host@" in - *-cygwin) - prefix=`cygpath -w "$prefix"`;; -esac - -exec_prefix="@exec_prefix@" -GF_BIN_DIR="@bindir@" -GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@" - -JAVA="@JAVA@" - -GF="$GF_BIN_DIR/gf" -JARFILE="$GF_DATA_DIR/gfeditor.jar" - -if [ ! -x "${JAVA}" ]; then - JAVA=`which java` -fi - -if [ ! -x "${JAVA}" ]; then - echo "No Java VM found." - exit 1 -fi - -if [ ! -r "${JARFILE}" ]; then - echo "Cannot read JAR file ${JARFILE}." - exit 1 -fi - -if [ ! -x "${GF}" ]; then - GF=`which gf` -fi - -if [ ! -x "${GF}" ]; then - echo "GF not found." - exit 1 -fi - -exec "${JAVA}" -jar "${JARFILE}" -g "${GF}" $* diff --git a/src/jgf.bat b/src/jgf.bat deleted file mode 100644 index d56a638d5..000000000 --- a/src/jgf.bat +++ /dev/null @@ -1 +0,0 @@ -java -jar "%GF_HOME%\gf-java.jar" "%GF_HOME%\gf.exe" %* diff --git a/src/jgf.in b/src/jgf.in deleted file mode 100644 index 3df121a64..000000000 --- a/src/jgf.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -prefix="@prefix@" - -case "@host@" in - *-cygwin) - prefix=`cygpath -w "$prefix"`;; -esac - -exec_prefix="@exec_prefix@" -GF_BIN_DIR="@bindir@" -GF_DATA_DIR="@datadir@/GF-@PACKAGE_VERSION@" - -JAVA="@JAVA@" - -GF="$GF_BIN_DIR/gf" -JARFILE="$GF_DATA_DIR/gf-java.jar" - -if [ ! -x "${JAVA}" ]; then - JAVA=`which java` -fi - -if [ ! -x "${JAVA}" ]; then - echo "No Java VM found." - exit 1 -fi - -if [ ! -r "${JARFILE}" ]; then - echo "Cannot read JAR file ${JARFILE}." - exit 1 -fi - -if [ ! -x "${GF}" ]; then - GF=`which gf` -fi - -if [ ! -x "${GF}" ]; then - echo "GF not found." - exit 1 -fi - -exec "${JAVA}" -jar "${JARFILE}" "$GF -java $*" |