1ea63ef8be
* sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. From-SVN: r104586
160 lines
5.6 KiB
Makefile
160 lines
5.6 KiB
Makefile
JAVA_DEPEND = java.dep
|
|
|
|
## silently try to include these, if it fails gnu make
|
|
## will remake these 'makefiles' with the rules given in
|
|
## this file and restart the make process again
|
|
sinclude $(JAVA_DEPEND)
|
|
|
|
propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print)
|
|
propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print)
|
|
metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print)
|
|
iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
|
|
|
|
compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB)
|
|
|
|
# handling source to bytecode compiler programs like gcj, jikes and kjc
|
|
if FOUND_GCJ
|
|
## This should never be used when gcj is the compiler.
|
|
## See the compile-classes target.
|
|
JAVAC = exit 1
|
|
else
|
|
if FOUND_JIKES
|
|
JAVAC = $(JIKES) +Pno-shadow +Pno-switchcheck +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes
|
|
else
|
|
if FOUND_KJC
|
|
## FIXME: from what I can tell, kjc does not support a -encoding option.
|
|
JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes
|
|
else
|
|
if FOUND_GCJX
|
|
JAVAC = $(GCJX) -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes
|
|
else
|
|
if FOUND_ECJ
|
|
JAVAC = $(ECJ) -encoding UTF-8 -warn:none -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes
|
|
endif # FOUND_ECJ
|
|
endif # FOUND_GCJX
|
|
endif # FOUND_KJC
|
|
endif # FOUND_GCJ
|
|
endif # FOUND_JIKES
|
|
|
|
JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB)
|
|
|
|
if INSTALL_GLIBJ_ZIP
|
|
|
|
pkgdata_DATA = glibj.zip
|
|
|
|
endif # INSTALL_GLIBJ_ZIP
|
|
|
|
if BUILD_CLASS_FILES
|
|
noinst_DATA = genclasses compile-classes resources
|
|
endif # BUILD_CLASS_FILES
|
|
|
|
if INSTALL_CLASS_FILES
|
|
|
|
install-data-local: genclasses compile-classes
|
|
-$(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir)
|
|
cp -R gnu $(DESTDIR)$(pkgdatadir)
|
|
cp -R java $(DESTDIR)$(pkgdatadir)
|
|
cp -R javax $(DESTDIR)$(pkgdatadir)
|
|
cp -R org $(DESTDIR)$(pkgdatadir)
|
|
cp -R META-INF $(DESTDIR)$(pkgdatadir)
|
|
|
|
# FIXME - should mimic doc/api/Makefile.am instead...
|
|
uninstall-local:
|
|
rm -rf $(DESTDIR)$(pkgdatadir)/gnu
|
|
rm -rf $(DESTDIR)$(pkgdatadir)/java
|
|
rm -rf $(DESTDIR)$(pkgdatadir)/javax
|
|
rm -rf $(DESTDIR)$(pkgdatadir)/org
|
|
rm -rf $(DESTDIR)$(pkgdatadir)/META-INF
|
|
|
|
endif # INSTALL_CLASS_FILES
|
|
|
|
.PHONY: genclasses
|
|
|
|
glibj.zip: classes compile-classes resources
|
|
if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi
|
|
|
|
resources:
|
|
if ! [ -e gnu ]; then mkdir gnu; fi
|
|
if ! [ -e gnu/java ]; then mkdir gnu/java; fi
|
|
if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi
|
|
if ! [ -e gnu/javax/swing/plaf/gtk/icons ]; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi
|
|
@list='$(propertydirs)'; for p in $$list; do \
|
|
if ! [ -e $$p ]; then mkdir $$p; fi; \
|
|
done
|
|
@list='$(propertyfiles)'; for p in $$list; do \
|
|
cp $(top_srcdir)/resource/$$p $$p; \
|
|
done
|
|
@list='$(metafiles)'; for p in $$list; do \
|
|
cp $(top_srcdir)/resource/$$p $$p; \
|
|
done
|
|
@list='$(iconfiles)'; for p in $$list; do \
|
|
cp $(top_srcdir)/$$p $$p; \
|
|
done
|
|
touch resources
|
|
|
|
classes: genclasses
|
|
|
|
$(top_builddir)/java/util/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh
|
|
mkdir -p $(top_builddir)/java/util
|
|
$(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/java/util/LocaleData.java
|
|
|
|
genclasses: gen-classlist.sh standard.omit $(top_builddir)/java/util/LocaleData.java gen-xpath-parser
|
|
top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) ./gen-classlist.sh standard
|
|
|
|
# Only rebuild parsers when explicitly asked to.
|
|
if REGEN_PARSERS
|
|
|
|
gen-xpath-parser: $(top_srcdir)/gnu/xml/xpath/XPathParser.java
|
|
|
|
$(top_srcdir)/gnu/xml/xpath/XPathParser.java: $(top_srcdir)/gnu/xml/xpath/XPathParser.y
|
|
( cd $(top_srcdir)/gnu/xml/xpath; \
|
|
$(JAY) XPathParser.y < $(JAY_SKELETON) > XPathParser.java )
|
|
else
|
|
|
|
gen-xpath-parser:
|
|
true
|
|
|
|
endif # REGEN_PARSER
|
|
|
|
$(JAVA_DEPEND): genclasses
|
|
|
|
if FOUND_GCJ
|
|
## When building with gcj, we do a recursive make. We split this rule
|
|
## out specially, rather than simply defining JAVAC, so that GNU make
|
|
## will see the recursive make invocation and still allow parallel
|
|
## builds.
|
|
compile-classes: classes $(JAVA_SRCS) Makefile
|
|
$(MAKE) -f $(srcdir)/Makefile.gcj \
|
|
GCJ='$(GCJ)' \
|
|
compile_classpath='$(top_builddir):$(compile_classpath)' \
|
|
top_srcdir=$(top_srcdir)
|
|
else
|
|
compile-classes: classes $(JAVA_SRCS) Makefile
|
|
$(JAVAC)
|
|
touch compile-classes
|
|
endif
|
|
|
|
EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh
|
|
CLEANFILES = compile-classes resources classes \
|
|
glibj.zip classes.1 \
|
|
$(top_builddir)/java/util/LocaleData.java \
|
|
$(JAVA_DEPEND)
|
|
|
|
clean-local:
|
|
-rm -rf gnu
|
|
-rm -rf java
|
|
-rm -rf javax
|
|
-rm -rf org
|
|
-rm -rf META-INF
|
|
-rm -rf lists
|
|
-rm -f Makefile.deps
|
|
|
|
dist-hook:
|
|
mkdir -p $(distdir)
|
|
cp -dfR $(top_srcdir)/gnu $(top_srcdir)/java $(top_srcdir)/javax $(top_srcdir)/org $(top_srcdir)/vm $(top_srcdir)/resource $(top_distdir)
|
|
# Delete not wanted files.
|
|
$(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm $(top_distdir)/resource -name CVS -print | xargs rm -fr
|
|
$(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm $(top_distdir)/resource -name .cvsignore -print | xargs rm -f
|
|
$(FIND) $(top_distdir)/gnu $(top_distdir)/java $(top_distdir)/javax $(top_distdir)/org $(top_distdir)/vm -name class-dependencies.conf -print | xargs rm -f
|
|
rm -f $(top_distdir)/gnu/classpath/Configuration.java
|
|
rm -f $(top_distdir)/java/util/LocaleData.java
|