diff --git festival.orig/config/modules/linux16_audio.mak festival/config/modules/linux16_audio.mak index e19ea82..a1eb469 100644 --- festival.orig/config/modules/linux16_audio.mak +++ festival/config/modules/linux16_audio.mak @@ -51,7 +51,3 @@ endif ifeq ($(LINUXAUDIO),none) AUDIO_DEFINES += -DSUPPORT_VOXWARE endif - -ifdef INCLUDE_JAVA_CPP - MODULE_LIBS += -lpthread -endif diff --git festival.orig/config/project.mak festival/config/project.mak index 6456309..3f36fd6 100644 --- festival.orig/config/project.mak +++ festival/config/project.mak @@ -52,9 +52,6 @@ PROJECT_OTHER_CONFIGS = $(EST)/config/config MODULE_DIRECTORY = $(TOP)/src/modules -DISTRIBUTED_MODULES = \ - JAVA - DEVELOPMENT_MODULES = RJC_SYNTHESIS \ UNISYN_PHONOLOGY @@ -101,12 +98,6 @@ PROJECT_TEMPLATE_DBS = $(TOP) $(EST) LIBRARY_TEMPLATE_DIRS_estools = $(LIBRARY_TEMPLATE_DIRS:%=$(EST)/%) -JAVA_CLASS_LIBRARY = $(TOP)/src/lib/festival.jar - -JAVA_CLASSPATH= $(TOP)/lib/festival.jar:$(EST_HOME)/lib/est_$(EST_JAVA_VERSION).jar:$(SYSTEM_JAVA_CLASSPATH) - -PROJECT_JAVA_ROOT=$(TOP)/src/modules/java - # Places to look for documentation DOCXX_DIRS = $(TOP)/src diff --git festival.orig/config/systems/Linux.mak festival/config/systems/Linux.mak index 923c9a7..7b7cb51 100644 --- festival.orig/config/systems/Linux.mak +++ festival/config/systems/Linux.mak @@ -40,11 +40,6 @@ include $(EST)/config/systems/default.mak -DEFAULT_JAVA_HOME=/usr/lib/jdk-1.1.6 -JAVA=/usr/bin/java -JAVAC=/usr/bin/javac -JAVAH=/usr/bin/javah - TCL_LIBRARY = -ltcl OS_LIBS = -ldl diff --git festival.orig/config/systems/default.mak festival/config/systems/default.mak index 69e8835..602ff77 100644 --- festival.orig/config/systems/default.mak +++ festival/config/systems/default.mak @@ -139,6 +139,3 @@ DOCXX_ARGS = -a -f -B banner.inc -M sane -D 'SYSTEM "$(EST_HOME)/doc/sane.dtd"' COMPILER_VERSION_COMMAND=true -JAVA_COMPILER_VERSION_COMMAND=true - -JAVA_SYSTEM_INCLUDES = -I$(JAVA_HOME)/include/genunix diff --git festival.orig/lib/Makefile festival/lib/Makefile index bd89321..79176e4 100644 --- festival.orig/lib/Makefile +++ festival/lib/Makefile @@ -56,7 +56,7 @@ GENERAL = init.scm synthesis.scm module_description.scm \ voices.scm tts.scm festdoc.scm languages.scm token.scm \ mbrola.scm display.scm postlex.scm tokenpos.scm \ festtest.scm cslush.scm cart_aux.scm pauses.scm \ - scfg.scm mettree.scm java.scm clunits.scm clunits_build.scm \ + scfg.scm mettree.scm clunits.scm clunits_build.scm \ siteinit.scm HTS = hts.scm OTHERS = Sable.v0_2.dtd sable-latin.ent festival.el scfg_wsj_wp20.gram \ diff --git festival.orig/src/modules/Makefile festival/src/modules/Makefile index 555cb75..d493f92 100644 --- festival.orig/src/modules/Makefile +++ festival/src/modules/Makefile @@ -44,7 +44,7 @@ BASE_DIRS = Lexicon base Duration Intonation Text \ LIB_BUILD_DIRS = $(BASE_DIRS) BUILD_DIRS = $(LIB_BUILD_DIRS) -OPTIONAL = diphone clunits clustergen java rxp UniSyn_phonology MultiSyn hts_engine +OPTIONAL = diphone clunits clustergen rxp UniSyn_phonology MultiSyn hts_engine ALL_DIRS = $(BASE_DIRS) $(OPTIONAL) diff --git festival.orig/src/scripts/Makefile festival/src/scripts/Makefile index 89d3b43..684842a 100644 --- festival.orig/src/scripts/Makefile +++ festival/src/scripts/Makefile @@ -40,7 +40,6 @@ TOP=../.. DIRNAME=src/scripts SCRIPTS= festival_server.sh festival_server_control.sh -EXTRA_SCRIPTS = jsapi_example.sh festival_client_java.sh FILES = Makefile shared_setup_sh shared_setup_prl shared_script $(SCRIPTS) $(EXTRA_SCRIPTS) INSTALL = ALL = $(SCRIPTS)