forked from GitHub/gf-core
Fix conditional checks so that java code is compiled when it should.
This commit is contained in:
16
src/Makefile
16
src/Makefile
@@ -19,24 +19,24 @@ BIN_DIST_DIR=$(DIST_DIR)-$(host)
|
|||||||
|
|
||||||
SNAPSHOT_DIR=GF-$(shell date +%Y%m%d)
|
SNAPSHOT_DIR=GF-$(shell date +%Y%m%d)
|
||||||
|
|
||||||
ifeq ($(READLINE),readline)
|
|
||||||
GHCFLAGS += -package readline -DUSE_READLINE
|
|
||||||
endif
|
|
||||||
|
|
||||||
GF_EXE=gf$(EXEEXT)
|
GF_EXE=gf$(EXEEXT)
|
||||||
GF_EXE_TMP=gf-bin$(EXEEXT)
|
GF_EXE_TMP=gf-bin$(EXEEXT)
|
||||||
GF_DOC_EXE=gfdoc$(EXEEXT)
|
GF_DOC_EXE=gfdoc$(EXEEXT)
|
||||||
|
|
||||||
.PHONY: all unix jar gfdoc windows install install-gf \
|
ifeq ("$(READLINE)","readline")
|
||||||
temp install-gfdoc install-editor \
|
GHCFLAGS += -package readline -DUSE_READLINE
|
||||||
today help clean
|
endif
|
||||||
|
|
||||||
ifeq ($(ENABLE_JAVA), "yes")
|
ifeq ("$(ENABLE_JAVA)", "yes")
|
||||||
BUILD_JAR=jar
|
BUILD_JAR=jar
|
||||||
else
|
else
|
||||||
BUILD_JAR=
|
BUILD_JAR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
.PHONY: all unix jar gfdoc windows install install-gf \
|
||||||
|
temp install-gfdoc install-editor \
|
||||||
|
today help clean
|
||||||
|
|
||||||
all: unix gfdoc $(BUILD_JAR)
|
all: unix gfdoc $(BUILD_JAR)
|
||||||
|
|
||||||
unix: today touch-files opt
|
unix: today touch-files opt
|
||||||
|
|||||||
Reference in New Issue
Block a user