0.25.0 :: gnome-speech problem and fix

[Nick <nick-nospam codesniffer com>]

Building 0.25.0 on my system failed in the Java portion of gnome-speech
(garnome-0.25.0/gnome/gnome-speech/work/main.d/gnome-speech-0.2.3/java).  The problem was the lack of a reference to compiled CORBA files (generated from the IDL) in org/GNOME/Bonobo.

To fix it, two things were necessary:
1.  Build org/GNOME/Bonobo java files
2.  Include org/GNOME/Bonobo java classes while compiling
org/GNOME/Speech java files.

Attached and below is my modified
garnome-0.25.0/gnome/gnome-speech/work/main.d/gnome-speech-0.2.3/java/Makefile.am file which fixed the problem.

Regards,
Nick G.

=======================================================================

if BUILD_JAVA_PACKAGE
GNOME_SPEECH_CLASS_FILES=org/GNOME/Speech/*.class
GNOME_SPEECH_JAVA_FILES=org/GNOME/Speech/*.java
GNOME_SPEECH_IDL_FILES = \
	$(top_srcdir)/idl/GNOME_Speech_SynthesisDriver.idl 

GNOME_BONOBO_CLASS_FILES = org/GNOME/Bonobo/*.class
GNOME_BONOBO_JAVA_FILES = org/GNOME/Bonobo/*.java

IDLJ_FLAGS = \
	-emitAll \
	-i $(BONOBO_ACTIVATION_IDL_DIR) \
	-i $(top_srcdir)/idl

	
gnome-speech.jar: $(GNOME_BONOBO_CLASS_FILES)
$(GNOME_SPEECH_CLASS_FILES)
	jar -cf gnome-speech.jar $(GNOME_BONOBO_CLASS_FILES)
$(GNOME_SPEECH_CLASS_FILES)

$(GNOME_SPEECH_CLASS_FILES): $(GNOME_BONOBO_CLASS_FILES)
$(GNOME_SPEECH_JAVA_FILES)
	$(JAVAC) -classpath . $(GNOME_SPEECH_JAVA_FILES)

$(GNOME_SPEECH_JAVA_FILES):
	$(IDLJ) \
	$(IDLJ_FLAGS) \
	-pkgPrefix GNOME org \
	-pkgPrefix Bonobo org.GNOME \
	-fallTie $(GNOME_SPEECH_IDL_FILES)

$(GNOME_BONOBO_CLASS_FILES): $(GNOME_BONOBO_JAVA_FILES)
	$(JAVAC) $(GNOME_BONOBO_JAVA_FILES)

clean:
	rm $(GNOME_SPEECH_JAVA_FILES)
	rm $(GNOME_SPEECH_CLASS_FILES)
	rm gnome-speech.jar

gnome_speech_jardir = \
	$(prefix)/share/jar

gnome_speech_jar_DATA = \
	gnome-speech.jar
endif

=======================================================================

if BUILD_JAVA_PACKAGE
GNOME_SPEECH_CLASS_FILES=org/GNOME/Speech/*.class
GNOME_SPEECH_JAVA_FILES=org/GNOME/Speech/*.java
GNOME_SPEECH_IDL_FILES = \
	$(top_srcdir)/idl/GNOME_Speech_SynthesisDriver.idl 

GNOME_BONOBO_CLASS_FILES = org/GNOME/Bonobo/*.class
GNOME_BONOBO_JAVA_FILES = org/GNOME/Bonobo/*.java

IDLJ_FLAGS = \
	-emitAll \
	-i $(BONOBO_ACTIVATION_IDL_DIR) \
	-i $(top_srcdir)/idl

	
gnome-speech.jar: $(GNOME_BONOBO_CLASS_FILES) $(GNOME_SPEECH_CLASS_FILES)
	jar -cf gnome-speech.jar $(GNOME_BONOBO_CLASS_FILES) $(GNOME_SPEECH_CLASS_FILES)

$(GNOME_SPEECH_CLASS_FILES): $(GNOME_BONOBO_CLASS_FILES) $(GNOME_SPEECH_JAVA_FILES)
	$(JAVAC) -classpath . $(GNOME_SPEECH_JAVA_FILES)

$(GNOME_SPEECH_JAVA_FILES):
	$(IDLJ) \
	$(IDLJ_FLAGS) \
	-pkgPrefix GNOME org \
	-pkgPrefix Bonobo org.GNOME \
	-fallTie $(GNOME_SPEECH_IDL_FILES)

$(GNOME_BONOBO_CLASS_FILES): $(GNOME_BONOBO_JAVA_FILES)
	$(JAVAC) $(GNOME_BONOBO_JAVA_FILES)

clean:
	rm $(GNOME_SPEECH_JAVA_FILES)
	rm $(GNOME_SPEECH_CLASS_FILES)
	rm gnome-speech.jar

gnome_speech_jardir = \
	$(prefix)/share/jar

gnome_speech_jar_DATA = \
	gnome-speech.jar
endif