From 947b8814056ea2fba6bbcfab86591f74bffc0311 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 23 Sep 2005 21:31:04 +0000 Subject: Imported Classpath 0.18. * 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 * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons * 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 * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104586 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/examples/Makefile.am | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'libjava/classpath/examples/Makefile.am') diff --git a/libjava/classpath/examples/Makefile.am b/libjava/classpath/examples/Makefile.am index 74abc11c066..b7eeacb63fe 100644 --- a/libjava/classpath/examples/Makefile.am +++ b/libjava/classpath/examples/Makefile.am @@ -22,6 +22,9 @@ endif # All our example java source files EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java +# The example C source files +EXAMPLE_C_FILES = $(srcdir)/gnu/classpath/examples/*/*.c + # The zip files with classes we want to produce. EXAMPLE_ZIP = examples.zip @@ -31,6 +34,9 @@ BUILT_SOURCES = $(EXAMPLE_ZIP) # the png icons we use in some of the examples. EXAMPLE_ICONS = $(srcdir)/gnu/classpath/examples/icons/*.png +# All the files we find "interesting" +ALL_EXAMPLE_FILES = $(EXAMPLE_JAVA_FILES) $(EXAMPLE_C_FILES) $(EXAMPLE_ICONS) + # Some architecture independent data to be installed. example_DATA = $(EXAMPLE_ZIP) README @@ -41,7 +47,7 @@ exampledir = $(pkgdatadir)/examples # (Be careful to strip off the srcdir part of the path when installing.) install-data-local: srcdir_cnt=`echo $(srcdir) | wc -c`; \ - for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \ + for file in $(ALL_EXAMPLE_FILES); do \ f=`echo $$file | cut -c$$srcdir_cnt-`; \ fdir=`dirname $$f`; \ if test ! -d $(DESTDIR)/$(pkgdatadir)/examples/$$fdir; then \ @@ -51,20 +57,24 @@ install-data-local: echo "$(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \ $(INSTALL_DATA) $$file $(DESTDIR)/$(pkgdatadir)/examples/$$f; \ done + echo "$(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/" + $(INSTALL_DATA) Makefile.jawt $(DESTDIR)/$(pkgdatadir)/examples/ uninstall-local: srcdir_cnt=`echo $(srcdir) | wc -c`; \ - for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \ + for file in $(ALL_EXAMPLE_FILES); do \ f=`echo $$file | cut -c$$srcdir_cnt-`; \ echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f"; \ rm -f $(DESTDIR)/$(pkgdatadir)/examples/$$f; \ done + echo "rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt" + rm -f $(DESTDIR)/$(pkgdatadir)/examples/Makefile.jawt # Make sure everything is included in the distribution. -EXTRA_DIST = README +EXTRA_DIST = README Makefile.jawt.in dist-hook: srcdir_cnt=`echo $(srcdir) | wc -c`; \ - for file in $(EXAMPLE_JAVA_FILES) $(EXAMPLE_ICONS); do \ + for file in $(ALL_EXAMPLE_FILES); do \ f=`echo $$file | cut -c$$srcdir_cnt-`; \ fdir=`dirname $$f`; \ if test ! -d $(distdir)/$$fdir; then \ @@ -87,4 +97,4 @@ $(EXAMPLE_ZIP): $(EXAMPLE_JAVA_FILES) # Zip file be gone! (and make sure the classes are gone too) clean-local: - rm -f $(EXAMPLE_ZIP) classes + rm -rf $(EXAMPLE_ZIP) classes -- cgit v1.2.3