From ffde862e033a0825e1e9972a89c0f1f80b261a8e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 14 Aug 2006 23:12:35 +0000 Subject: 2006-08-14 Mark Wielaard Imported GNU Classpath 0.92 * HACKING: Add more importing hints. Update automake version requirement. * configure.ac (gconf-peer): New enable AC argument. Add --disable-gconf-peer and --enable-default-preferences-peer to classpath configure when gconf is disabled. * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and gnu/java/awt/dnd/peer/gtk to bc. Classify gnu/java/security/Configuration.java as generated source file. * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java, gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java, gnu/java/lang/management/VMClassLoadingMXBeanImpl.java, gnu/java/lang/management/VMRuntimeMXBeanImpl.java, gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java, gnu/java/lang/management/VMThreadMXBeanImpl.java, gnu/java/lang/management/VMMemoryMXBeanImpl.java, gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub classes. * java/lang/management/VMManagementFactory.java: Likewise. * java/net/VMURLConnection.java: Likewise. * gnu/java/nio/VMChannel.java: Likewise. * java/lang/Thread.java (getState): Add stub implementation. * java/lang/Class.java (isEnum): Likewise. * java/lang/Class.h (isEnum): Likewise. * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed. * javax/naming/spi/NamingManager.java: New override for StackWalker functionality. * configure, sources.am, Makefile.in, gcj/Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116139 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/examples/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libjava/classpath/examples/Makefile.am') diff --git a/libjava/classpath/examples/Makefile.am b/libjava/classpath/examples/Makefile.am index 71909e8d64d..84e3ebe0fc9 100644 --- a/libjava/classpath/examples/Makefile.am +++ b/libjava/classpath/examples/Makefile.am @@ -23,8 +23,9 @@ endif # All our example java source files EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java -# The example C source files +# The example C source & header files EXAMPLE_C_FILES = $(srcdir)/gnu/classpath/examples/*/*.c +EXAMPLE_CH_FILES = $(srcdir)/gnu/classpath/examples/*/*.h # The zip files with classes we want to produce. EXAMPLE_ZIP = examples.zip @@ -39,7 +40,7 @@ EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png READMES = $(srcdir)/gnu/classpath/examples/CORBA/swing/README.html # All the files we find "interesting" -ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_ICONS) $(READMES) +ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_CH_FILES) $(EXAMPLE_ICONS) $(READMES) # Some architecture independent data to be installed. example_DATA = $(EXAMPLE_ZIP) README @@ -62,7 +63,9 @@ install-data-local: $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/examples/$$f; \ done echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/" + echo "$(INSTALL_DATA) Makefile.java2d $(DESTDIR)$(pkgdatadir)/examples/" $(INSTALL_DATA) Makefile.jawt $(DESTDIR)$(pkgdatadir)/examples/ + $(INSTALL_DATA) Makefile.java2d $(DESTDIR)$(pkgdatadir)/examples/ uninstall-local: srcdir_cnt=`echo $(srcdir) | wc -c`; \ @@ -72,10 +75,12 @@ uninstall-local: rm -f $(DESTDIR)$(pkgdatadir)/examples/$$f; \ done echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt" + echo "rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.java2d" rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.jawt + rm -f $(DESTDIR)$(pkgdatadir)/examples/Makefile.java2d # Make sure everything is included in the distribution. -EXTRA_DIST = README Makefile.jawt.in +EXTRA_DIST = README Makefile.jawt.in Makefile.java2d.in dist-hook: srcdir_cnt=`echo $(srcdir) | wc -c`; \ for file in $(ALL_EXAMPLE_FILES); do \ -- cgit v1.2.3