diff options
| -rw-r--r-- | libjava/ChangeLog | 17 | ||||
| -rw-r--r-- | libjava/Makefile.am | 51 | ||||
| -rw-r--r-- | libjava/Makefile.in | 130 | ||||
| -rw-r--r-- | libjava/classpath/Makefile.am | 5 | ||||
| -rw-r--r-- | libjava/classpath/Makefile.in | 4 | ||||
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 116 | ||||
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 402 |
7 files changed, 318 insertions, 407 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9076505..8f53b0a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,20 @@ +2006-06-30 Thomas Fitzsimmons <fitzsim@redhat.com> + + * classpath/tools/Makefile.am: Comment out tools wrapper creation. + (TOOLS_ZIP): Rename tools.zip tools.jar. + (noinst_DATA): Do not install tools.jar. + * classpath/tools/Makefile.in: Regenerate. + * classpath/Makefile.am (SUBDIRS): Add tools. + (DIST_SUBDIRS): Likewise. + * classpath/Makefile.in: Regenerate. + * Makefile.am (toolexeclib_LTLIBRARIES): Add libgcj-tools.la. + (jar_DATA): Add libgcj-tools-$(gcc_version).jar. + (bin_PROGRAMS): Add gappletviewer, gjarsigner and gkeytool. + Add build logic for libgcj-tools.la, + libgcj-tools-$(gcc_version).jar and gappletviewer, gjarsigner and + gkeytool. + * Makefile.in: Regenerate. + 2006-06-29 Ranjit Mathew <rmathew@gcc.gnu.org> * gcj/javaprims.h (_Jv_uintptr_t): New typedef similar to uintptr_t in diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 6404234..8acc260 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -33,7 +33,7 @@ libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) ## What gets installed, and where. ## -toolexeclib_LTLIBRARIES = libgcj.la libgij.la +toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la toolexecmainlib_DATA = libgcj.spec if XLIB_AWT @@ -46,7 +46,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java -jar_DATA = libgcj-$(gcc_version).jar +jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar if JAVA_HOME_SET JAVA_HOME_DIR = $(JAVA_HOME) @@ -68,7 +68,8 @@ db_pathtail = gcj-$(gcc_version)/$(db_name) ## For now, only on native systems. FIXME. if NATIVE -bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool +bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \ + gappletviewer gjarsigner gkeytool ## It is convenient to actually build and install the default database ## when gcj-dbtool is available. @@ -234,6 +235,12 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ $(LIBLTDL) $(libgcj_la_LIBADD) libgcj_la_LINK = $(LIBLINK) +libgcj_tools_la_SOURCES = classpath/tools/tools.jar +libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch +libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` +libgcj_tools_la_LINK = $(LIBLINK) + ## libjvm.so libjvm_la_SOURCES = jni-libjvm.cc libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec @@ -282,7 +289,10 @@ libgcj-$(gcc_version).jar: classpath/lib/compile-classes cd classpath/lib; $(JAR) -cfM \ ../../libgcj-$(gcc_version).jar gnu java javax org -CLEANFILES = libgcj-$(gcc_version).jar +libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar + cp $< $@ + +CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar DISTCLEANFILES = native.dirs mostlyclean-local: @@ -721,6 +731,39 @@ grmiregistry_LDADD = -L$(here)/.libs libgcj.la ## linking this program. grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec +## This is a dummy definition. +gappletviewer_SOURCES = +gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) +gappletviewer_LINK = $(GCJLINK) +## See jv_convert_LDADD. +gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la +## Depend on the spec file to make sure it is up to date before +## linking this program. +gappletviewer_DEPENDENCIES = libgcj-tools.la + +## This is a dummy definition. +gjarsigner_SOURCES = +gjarsigner_LDFLAGS = --main=gnu.classpath.tools.jarsigner.Main \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) +gjarsigner_LINK = $(GCJLINK) +## See jv_convert_LDADD. +gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la +## Depend on the spec file to make sure it is up to date before +## linking this program. +gjarsigner_DEPENDENCIES = libgcj-tools.la + +## This is a dummy definition. +gkeytool_SOURCES = +gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) +gkeytool_LINK = $(GCJLINK) +## See jv_convert_LDADD. +gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la +## Depend on the spec file to make sure it is up to date before +## linking this program. +gkeytool_DEPENDENCIES = libgcj-tools.la + ## ################################################################ ## This lists all the C++ source files in subdirectories. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 364e22a..457d11c 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -44,7 +44,8 @@ target_triplet = @target@ @XLIB_AWT_TRUE@am__append_2 = lib-gnu-awt-xlib.la @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \ @NATIVE_TRUE@ grmic$(EXEEXT) grmiregistry$(EXEEXT) \ -@NATIVE_TRUE@ gcj-dbtool$(EXEEXT) +@NATIVE_TRUE@ gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \ +@NATIVE_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) @BASH_JAR_TRUE@am__append_3 = scripts/jar @USING_GCC_TRUE@am__append_4 = $(WARNINGS) @USING_BOEHMGC_TRUE@am__append_5 = boehm.cc @@ -136,6 +137,9 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt_xlib_la-natClip.lo \ am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1) lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS) @XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir) +libgcj_tools_la_LIBADD = +am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo +libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS) am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \ gnu/classpath/debug.lo gnu/classpath/jdwp.lo \ gnu/classpath/jdwp/event.lo \ @@ -349,6 +353,8 @@ am_libjvm_la_OBJECTS = jni-libjvm.lo libjvm_la_OBJECTS = $(am_libjvm_la_OBJECTS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) +am_gappletviewer_OBJECTS = +gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS) am_gcj_dbtool_OBJECTS = gnu/gcj/tools/gcj_dbtool/Main.$(OBJEXT) \ gnu/gcj/tools/gcj_dbtool/natMain.$(OBJEXT) gcj_dbtool_OBJECTS = $(am_gcj_dbtool_OBJECTS) @@ -360,6 +366,10 @@ gen_from_JIS_OBJECTS = $(am_gen_from_JIS_OBJECTS) gen_from_JIS_LDADD = $(LDADD) am_gij_OBJECTS = gij_OBJECTS = $(am_gij_OBJECTS) +am_gjarsigner_OBJECTS = +gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS) +am_gkeytool_OBJECTS = +gkeytool_OBJECTS = $(am_gkeytool_OBJECTS) am_grmic_OBJECTS = grmic_OBJECTS = $(am_grmic_OBJECTS) am_grmiregistry_OBJECTS = @@ -391,15 +401,19 @@ GCJCOMPILE = $(GCJ) $(AM_GCJFLAGS) $(GCJFLAGS) LTGCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) $(AM_GCJFLAGS) \ $(GCJFLAGS) GCJLD = $(GCJ) -SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_la_SOURCES) \ - $(libgij_la_SOURCES) $(libjvm_la_SOURCES) \ - $(gcj_dbtool_SOURCES) $(gen_from_JIS_SOURCES) $(gij_SOURCES) \ - $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES) +SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) $(libgcj_tools_la_SOURCES) \ + $(libgcj_la_SOURCES) $(libgij_la_SOURCES) $(libjvm_la_SOURCES) \ + $(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \ + $(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjarsigner_SOURCES) \ + $(gkeytool_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \ + $(jv_convert_SOURCES) DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \ - $(am__libgcj_la_SOURCES_DIST) $(libgij_la_SOURCES) \ - $(libjvm_la_SOURCES) $(gcj_dbtool_SOURCES) \ + $(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \ + $(libgij_la_SOURCES) $(libjvm_la_SOURCES) \ + $(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \ $(am__gen_from_JIS_SOURCES_DIST) $(gij_SOURCES) \ - $(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES) + $(gjarsigner_SOURCES) $(gkeytool_SOURCES) $(grmic_SOURCES) \ + $(grmiregistry_SOURCES) $(jv_convert_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -664,13 +678,14 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach o # This is required by TL_AC_GXX_INCLUDE_DIR. libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) -toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2) +toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \ + $(am__append_2) toolexecmainlib_DATA = libgcj.spec dbexec_LTLIBRARIES = libjvm.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgcj.pc jardir = $(datadir)/java -jar_DATA = libgcj-$(gcc_version).jar +jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix) @JAVA_HOME_SET_TRUE@JAVA_HOME_DIR = $(JAVA_HOME) @JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/$(jar_DATA) @@ -767,6 +782,12 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ $(LIBLTDL) $(libgcj_la_LIBADD) libgcj_la_LINK = $(LIBLINK) +libgcj_tools_la_SOURCES = classpath/tools/tools.jar +libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch +libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ + -version-info `grep -v '^\#' $(srcdir)/libtool-version` + +libgcj_tools_la_LINK = $(LIBLINK) libjvm_la_SOURCES = jni-libjvm.cc libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec libjvm_la_LIBADD = -L$(here)/.libs libgcj.la @@ -792,7 +813,7 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \ lib_gnu_awt_xlib_la_LINK = $(LIBLINK) propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files))) -CLEANFILES = libgcj-$(gcc_version).jar +CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar DISTCLEANFILES = native.dirs SUFFIXES = .class .java .h .properties .list gnu_CORBA_source_files = \ @@ -7037,6 +7058,27 @@ grmiregistry_LDFLAGS = --main=gnu.java.rmi.registry.RegistryImpl \ grmiregistry_LINK = $(GCJLINK) grmiregistry_LDADD = -L$(here)/.libs libgcj.la grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec +gappletviewer_SOURCES = +gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + +gappletviewer_LINK = $(GCJLINK) +gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la +gappletviewer_DEPENDENCIES = libgcj-tools.la +gjarsigner_SOURCES = +gjarsigner_LDFLAGS = --main=gnu.classpath.tools.jarsigner.Main \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + +gjarsigner_LINK = $(GCJLINK) +gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la +gjarsigner_DEPENDENCIES = libgcj-tools.la +gkeytool_SOURCES = +gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + +gkeytool_LINK = $(GCJLINK) +gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la +gkeytool_DEPENDENCIES = libgcj-tools.la nat_source_files = \ gnu/classpath/natSystemProperties.cc \ gnu/gcj/natCore.cc \ @@ -7179,7 +7221,7 @@ MULTICLEAN = true all: all-recursive .SUFFIXES: -.SUFFIXES: .class .java .h .properties .list .c .cc .lo .o .obj +.SUFFIXES: .class .java .h .properties .list .c .cc .jar .lo .o .obj am--refresh: @: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sources.am $(am__configure_deps) @@ -7341,6 +7383,17 @@ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXImage.lo: \ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo: \ gnu/gcj/xlib/$(am__dirstamp) \ gnu/gcj/xlib/$(DEPDIR)/$(am__dirstamp) +classpath/tools/$(am__dirstamp): + @$(mkdir_p) classpath/tools + @: > classpath/tools/$(am__dirstamp) +classpath/tools/$(DEPDIR)/$(am__dirstamp): + @$(mkdir_p) classpath/tools/$(DEPDIR) + @: > classpath/tools/$(DEPDIR)/$(am__dirstamp) +classpath/tools/libgcj_tools_la-tools.lo: \ + classpath/tools/$(am__dirstamp) \ + classpath/tools/$(DEPDIR)/$(am__dirstamp) +libgcj-tools.la: $(libgcj_tools_la_OBJECTS) $(libgcj_tools_la_DEPENDENCIES) + $(libgcj_tools_la_LINK) -rpath $(toolexeclibdir) $(libgcj_tools_la_LDFLAGS) $(libgcj_tools_la_OBJECTS) $(libgcj_tools_la_LIBADD) $(LIBS) java/lang/$(am__dirstamp): @$(mkdir_p) java/lang @: > java/lang/$(am__dirstamp) @@ -7647,6 +7700,9 @@ clean-noinstPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) + @rm -f gappletviewer$(EXEEXT) + $(gappletviewer_LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS) gnu/gcj/tools/gcj_dbtool/$(am__dirstamp): @$(mkdir_p) gnu/gcj/tools/gcj_dbtool @: > gnu/gcj/tools/gcj_dbtool/$(am__dirstamp) @@ -7673,6 +7729,12 @@ gen-from-JIS$(EXEEXT): $(gen_from_JIS_OBJECTS) $(gen_from_JIS_DEPENDENCIES) gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES) @rm -f gij$(EXEEXT) $(gij_LINK) $(gij_LDFLAGS) $(gij_OBJECTS) $(gij_LDADD) $(LIBS) +gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) + @rm -f gjarsigner$(EXEEXT) + $(gjarsigner_LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS) +gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) + @rm -f gkeytool$(EXEEXT) + $(gkeytool_LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS) grmic$(EXEEXT): $(grmic_OBJECTS) $(grmic_DEPENDENCIES) @rm -f grmic$(EXEEXT) $(grmic_LINK) $(grmic_LDFLAGS) $(grmic_OBJECTS) $(grmic_LDADD) $(LIBS) @@ -7704,6 +7766,8 @@ uninstall-binSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f classpath/tools/libgcj_tools_la-tools.$(OBJEXT) + -rm -f classpath/tools/libgcj_tools_la-tools.lo -rm -f gnu/classpath/natSystemProperties.$(OBJEXT) -rm -f gnu/classpath/natSystemProperties.lo -rm -f gnu/gcj/convert/JIS0208_to_Unicode.$(OBJEXT) @@ -7894,6 +7958,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verify.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32-threads.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/classpath/$(DEPDIR)/natSystemProperties.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/$(DEPDIR)/natCore.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/convert/$(DEPDIR)/JIS0208_to_Unicode.Plo@am__quote@ @@ -8169,6 +8234,37 @@ gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo: gnu/gcj/xlib/natXUnmapEvent. @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib_gnu_awt_xlib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gnu/gcj/xlib/lib_gnu_awt_xlib_la-natXUnmapEvent.lo `test -f 'gnu/gcj/xlib/natXUnmapEvent.cc' || echo '$(srcdir)/'`gnu/gcj/xlib/natXUnmapEvent.cc +.jar.o: +@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ +@am__fastdepGCJ_TRUE@ if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ +@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ $< + +.jar.obj: +@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \ +@am__fastdepGCJ_TRUE@ if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepGCJ_FALSE@ $(GCJCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.jar.lo: +@am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \ +@am__fastdepGCJ_TRUE@ if $(LTGCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ +@am__fastdepGCJ_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepGCJ_FALSE@ $(LTGCJCOMPILE) -c -o $@ $< + +classpath/tools/libgcj_tools_la-tools.lo: classpath/tools/tools.jar +@am__fastdepGCJ_TRUE@ if $(LIBTOOL) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -MT classpath/tools/libgcj_tools_la-tools.lo -MD -MP -MF "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo" -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.jar' || echo '$(srcdir)/'`classpath/tools/tools.jar; \ +@am__fastdepGCJ_TRUE@ then mv -f "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo" "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Plo"; else rm -f "classpath/tools/$(DEPDIR)/libgcj_tools_la-tools.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ source='classpath/tools/tools.jar' object='classpath/tools/libgcj_tools_la-tools.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepGCJ_FALSE@ DEPDIR=$(DEPDIR) $(GCJDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepGCJ_FALSE@ $(LIBTOOL) --mode=compile $(GCJ) $(libgcj_tools_la_GCJFLAGS) $(GCJFLAGS) -c -o classpath/tools/libgcj_tools_la-tools.lo `test -f 'classpath/tools/tools.jar' || echo '$(srcdir)/'`classpath/tools/tools.jar + .java.o: @am__fastdepGCJ_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \ @am__fastdepGCJ_TRUE@ if $(GCJCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \ @@ -8198,6 +8294,7 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs + -rm -rf classpath/tools/.libs classpath/tools/_libs -rm -rf gnu/classpath/.libs gnu/classpath/_libs -rm -rf gnu/gcj/.libs gnu/gcj/_libs -rm -rf gnu/gcj/convert/.libs gnu/gcj/convert/_libs @@ -8597,6 +8694,8 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f classpath/tools/$(DEPDIR)/$(am__dirstamp) + -rm -f classpath/tools/$(am__dirstamp) -rm -f gnu/classpath/$(DEPDIR)/$(am__dirstamp) -rm -f gnu/classpath/$(am__dirstamp) -rm -f gnu/gcj/$(DEPDIR)/$(am__dirstamp) @@ -8658,7 +8757,7 @@ clean-am: clean-binPROGRAMS clean-dbexecLTLIBRARIES clean-generic \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) + -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-libtool distclean-local distclean-tags @@ -8689,7 +8788,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) + -rm -rf ./$(DEPDIR) classpath/tools/$(DEPDIR) gnu/classpath/$(DEPDIR) gnu/gcj/$(DEPDIR) gnu/gcj/convert/$(DEPDIR) gnu/gcj/io/$(DEPDIR) gnu/gcj/runtime/$(DEPDIR) gnu/gcj/tools/gcj_dbtool/$(DEPDIR) gnu/gcj/util/$(DEPDIR) gnu/gcj/xlib/$(DEPDIR) gnu/java/lang/$(DEPDIR) gnu/java/net/$(DEPDIR) gnu/java/net/protocol/core/$(DEPDIR) gnu/java/nio/$(DEPDIR) gnu/java/nio/channels/$(DEPDIR) java/io/$(DEPDIR) java/lang/$(DEPDIR) java/lang/ref/$(DEPDIR) java/lang/reflect/$(DEPDIR) java/net/$(DEPDIR) java/nio/$(DEPDIR) java/nio/channels/$(DEPDIR) java/text/$(DEPDIR) java/util/$(DEPDIR) java/util/logging/$(DEPDIR) java/util/zip/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -8752,6 +8851,9 @@ libgcj-$(gcc_version).jar: classpath/lib/compile-classes cd classpath/lib; $(JAR) -cfM \ ../../libgcj-$(gcc_version).jar gnu java javax org +libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar + cp $< $@ + mostlyclean-local: find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f diff --git a/libjava/classpath/Makefile.am b/libjava/classpath/Makefile.am index 138ea25..82e97db 100644 --- a/libjava/classpath/Makefile.am +++ b/libjava/classpath/Makefile.am @@ -1,9 +1,8 @@ ## Input file for automake to generate the Makefile.in used by configure # lib first, to compile .class files before native code, last examples -## GCJ LOCAL: exclude tools directory -SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR) -DIST_SUBDIRS = lib doc external include native resource scripts examples +SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) +DIST_SUBDIRS = lib doc external include native resource scripts tools examples ## GCJ LOCAL: we need an extra -I here. ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config diff --git a/libjava/classpath/Makefile.in b/libjava/classpath/Makefile.in index 2f99e81..21f6a3f 100644 --- a/libjava/classpath/Makefile.in +++ b/libjava/classpath/Makefile.in @@ -295,8 +295,8 @@ target_vendor = @target_vendor@ vm_classes = @vm_classes@ # lib first, to compile .class files before native code, last examples -SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR) -DIST_SUBDIRS = lib doc external include native resource scripts examples +SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) +DIST_SUBDIRS = lib doc external include native resource scripts tools examples ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \ ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 \ diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index ced1811..cabe77d 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -21,66 +21,59 @@ endif endif endif -if CREATE_WRAPPERS -bin_SCRIPTS = -bin_PROGRAMS = gappletviewer gjarsigner gkeytool +## GCJ LOCAL: do not build and install wrapper binaries here, since +## the build ordering will not work. Instead build them in +## gcc/libjava/Makefile.am. +# if CREATE_WRAPPERS +# bin_SCRIPTS = +# bin_PROGRAMS = gappletviewer gjarsigner gkeytool + +# if FOUND_GCJ +# LIBJVM = -lgcj +# else +# if FOUND_CACAO +# LIBJVM = -ljvm +# else +# LIBJVM = +# endif +# endif + +# AM_CPPFLAGS = -Wall \ +# -I$(top_srcdir)/include \ +# -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" + +# gappletviewer_SOURCES = toolwrapper.c +# gappletviewer_CFLAGS = \ +# -DTOOLPACKAGE="\"appletviewer\"" \ +# -DTOOLNAME="\"gappletviewer\"" +# gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) + +# gjarsigner_SOURCES = toolwrapper.c +# gjarsigner_CFLAGS = \ +# -DTOOLPACKAGE="\"jarsigner\"" \ +# -DTOOLNAME="\"gjarsigner\"" +# gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) + +# gkeytool_SOURCES = toolwrapper.c +# gkeytool_CFLAGS = \ +# -DTOOLPACKAGE="\"keytool\"" \ +# -DTOOLNAME="\"gkeytool\"" +# gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM) + +# else +# bin_SCRIPTS = gappletviewer gjarsigner gkeytool +# bin_PROGRAMS = +# endif +EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in -if FOUND_GCJ -LIBJVM = -lgcj -else -if FOUND_CACAO -LIBJVM = -ljvm -else -LIBJVM = -endif -endif - -# Some architecture independent data to be installed. -TOOLS_DATA = $(TOOLS_ZIP) - -# Where we want these data files installed. -## GCJ LOCAL: install libgcj-tools.jar alongside libgcj.jar. -TOOLSdir = $(datadir)/java +# All our example java source files +TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java # The zip files with classes we want to produce. -## GCJ LOCAL: rename tools.zip libgcj-tools-$(gcc_version).jar -TOOLS_ZIP = libgcj-tools-$(gcc_version).jar - -## GCJ LOCAL: calculate GCC version -gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) - -gappletviewer_SOURCES = toolwrapper.c -gappletviewer_CFLAGS = -Wall \ - -I$(top_srcdir)/include \ - -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ - -DTOOLPACKAGE="\"appletviewer\"" \ - -DTOOLNAME="\"gappletviewer\"" -gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) - -gjarsigner_SOURCES = toolwrapper.c -gjarsigner_CFLAGS = -Wall \ - -I$(top_srcdir)/include \ - -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ - -DTOOLPACKAGE="\"jarsigner\"" \ - -DTOOLNAME="\"gjarsigner\"" -gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) - -gkeytool_SOURCES = toolwrapper.c -gkeytool_CFLAGS = -Wall \ - -I$(top_srcdir)/include \ - -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ - -DTOOLPACKAGE="\"keytool\"" \ - -DTOOLNAME="\"gkeytool\"" -gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM) -else -bin_SCRIPTS = appletviewer jarsigner keytool -bin_PROGRAMS = -endif -EXTRA_DIST = toolwrapper.c appletviewer.in jarsigner.in keytool.in - -# All our example java source files -TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java +## GCJ LOCAL: rename this tools.jar for libgcj_tools_la_SOURCES in +## gcc/libjava/Makefile.am. +TOOLS_ZIP = tools.jar # Extra objects that will not exist until configure-time BUILT_SOURCES = $(TOOLS_ZIP) @@ -103,6 +96,16 @@ READMES = $(srcdir)/gnu/classpath/tools/giop/README # All the files we find "interesting" ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(TOOLS_TEMPLATES) $(TOOLS_HELPS) +## GCJ LOCAL: build tools.zip but do not install it. It is installed +## in gcc/libjava/Makefile.am. +# # Some architecture independent data to be installed. +# TOOLS_DATA = $(TOOLS_ZIP) +noinst_DATA = $(TOOLS_ZIP) + +# Where we want these data files installed. +## GCJ LOCAL: install libgcj-tools.jar alongside libgcj.jar. +# TOOLSdir = $(datadir)/java + # Make sure everything is included in the distribution. dist-hook: srcdir_cnt=`echo $(srcdir) | wc -c`; \ @@ -121,6 +124,7 @@ dist-hook: # the class files. Always regenerate all .class files and remove them # immediately. And copy the template files we use to the classes dir # so they get also included. +## GCJ LOCAL: assume FASTJAR since we pass --with-fastjar to configure $(TOOLS_ZIP): $(TOOLS_JAVA_FILES) mkdir -p classes/gnu/classpath/tools/giop/grmic/templates mkdir -p classes/gnu/classpath/tools/rmi/rmic/templates diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 1674ffa..1600133 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -14,8 +14,6 @@ @SET_MAKE@ - - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,8 +37,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@CREATE_WRAPPERS_TRUE@bin_PROGRAMS = gappletviewer$(EXEEXT) \ -@CREATE_WRAPPERS_TRUE@ gjarsigner$(EXEEXT) gkeytool$(EXEEXT) subdir = tools DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/appletviewer.in $(srcdir)/jarsigner.in \ @@ -58,52 +54,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h CONFIG_CLEAN_FILES = appletviewer jarsigner keytool -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(TOOLSdir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am__gappletviewer_SOURCES_DIST = toolwrapper.c -@CREATE_WRAPPERS_TRUE@am_gappletviewer_OBJECTS = \ -@CREATE_WRAPPERS_TRUE@ gappletviewer-toolwrapper.$(OBJEXT) -gappletviewer_OBJECTS = $(am_gappletviewer_OBJECTS) -gappletviewer_LDADD = $(LDADD) -am__gjarsigner_SOURCES_DIST = toolwrapper.c -@CREATE_WRAPPERS_TRUE@am_gjarsigner_OBJECTS = \ -@CREATE_WRAPPERS_TRUE@ gjarsigner-toolwrapper.$(OBJEXT) -gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS) -gjarsigner_LDADD = $(LDADD) -am__gkeytool_SOURCES_DIST = toolwrapper.c -@CREATE_WRAPPERS_TRUE@am_gkeytool_OBJECTS = \ -@CREATE_WRAPPERS_TRUE@ gkeytool-toolwrapper.$(OBJEXT) -gkeytool_OBJECTS = $(am_gkeytool_OBJECTS) -gkeytool_LDADD = $(LDADD) -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) -SCRIPTS = $(bin_SCRIPTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(gappletviewer_SOURCES) $(gjarsigner_SOURCES) \ - $(gkeytool_SOURCES) -DIST_SOURCES = $(am__gappletviewer_SOURCES_DIST) \ - $(am__gjarsigner_SOURCES_DIST) $(am__gkeytool_SOURCES_DIST) -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -TOOLSDATA_INSTALL = $(INSTALL_DATA) -DATA = $(TOOLS_DATA) -ETAGS = etags -CTAGS = ctags +SOURCES = +DIST_SOURCES = +DATA = $(noinst_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -326,50 +279,55 @@ GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' # Setup the compiler to use the GNU Classpath library we just build @FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) -encoding UTF-8 --bootclasspath $(GLIBJ_CLASSPATH) --classpath . -C -@CREATE_WRAPPERS_FALSE@bin_SCRIPTS = appletviewer jarsigner keytool -@CREATE_WRAPPERS_TRUE@bin_SCRIPTS = -@CREATE_WRAPPERS_TRUE@@FOUND_CACAO_FALSE@@FOUND_GCJ_FALSE@LIBJVM = -@CREATE_WRAPPERS_TRUE@@FOUND_CACAO_TRUE@@FOUND_GCJ_FALSE@LIBJVM = -ljvm -@CREATE_WRAPPERS_TRUE@@FOUND_GCJ_TRUE@LIBJVM = -lgcj - -# Some architecture independent data to be installed. -@CREATE_WRAPPERS_TRUE@TOOLS_DATA = $(TOOLS_ZIP) - -# Where we want these data files installed. -@CREATE_WRAPPERS_TRUE@TOOLSdir = $(datadir)/java -# The zip files with classes we want to produce. -@CREATE_WRAPPERS_TRUE@TOOLS_ZIP = libgcj-tools-$(gcc_version).jar -@CREATE_WRAPPERS_TRUE@gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) -@CREATE_WRAPPERS_TRUE@gappletviewer_SOURCES = toolwrapper.c -@CREATE_WRAPPERS_TRUE@gappletviewer_CFLAGS = -Wall \ -@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ -@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"appletviewer\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gappletviewer\"" - -@CREATE_WRAPPERS_TRUE@gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) -@CREATE_WRAPPERS_TRUE@gjarsigner_SOURCES = toolwrapper.c -@CREATE_WRAPPERS_TRUE@gjarsigner_CFLAGS = -Wall \ -@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ -@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"jarsigner\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gjarsigner\"" - -@CREATE_WRAPPERS_TRUE@gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) -@CREATE_WRAPPERS_TRUE@gkeytool_SOURCES = toolwrapper.c -@CREATE_WRAPPERS_TRUE@gkeytool_CFLAGS = -Wall \ -@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ -@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"keytool\"" \ -@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gkeytool\"" - -@CREATE_WRAPPERS_TRUE@gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM) -EXTRA_DIST = toolwrapper.c appletviewer.in jarsigner.in keytool.in +# if CREATE_WRAPPERS +# bin_SCRIPTS = +# bin_PROGRAMS = gappletviewer gjarsigner gkeytool + +# if FOUND_GCJ +# LIBJVM = -lgcj +# else +# if FOUND_CACAO +# LIBJVM = -ljvm +# else +# LIBJVM = +# endif +# endif + +# AM_CPPFLAGS = -Wall \ +# -I$(top_srcdir)/include \ +# -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" + +# gappletviewer_SOURCES = toolwrapper.c +# gappletviewer_CFLAGS = \ +# -DTOOLPACKAGE="\"appletviewer\"" \ +# -DTOOLNAME="\"gappletviewer\"" +# gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) + +# gjarsigner_SOURCES = toolwrapper.c +# gjarsigner_CFLAGS = \ +# -DTOOLPACKAGE="\"jarsigner\"" \ +# -DTOOLNAME="\"gjarsigner\"" +# gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) + +# gkeytool_SOURCES = toolwrapper.c +# gkeytool_CFLAGS = \ +# -DTOOLPACKAGE="\"keytool\"" \ +# -DTOOLNAME="\"gkeytool\"" +# gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM) + +# else +# bin_SCRIPTS = gappletviewer gjarsigner gkeytool +# bin_PROGRAMS = +# endif +EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in # All our example java source files TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java +# The zip files with classes we want to produce. +TOOLS_ZIP = tools.jar + # Extra objects that will not exist until configure-time BUILT_SOURCES = $(TOOLS_ZIP) @@ -388,11 +346,14 @@ READMES = $(srcdir)/gnu/classpath/tools/giop/README # All the files we find "interesting" ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(TOOLS_TEMPLATES) $(TOOLS_HELPS) + +# # Some architecture independent data to be installed. +# TOOLS_DATA = $(TOOLS_ZIP) +noinst_DATA = $(TOOLS_ZIP) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -428,151 +389,6 @@ jarsigner: $(top_builddir)/config.status $(srcdir)/jarsigner.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ keytool: $(top_builddir)/config.status $(srcdir)/keytool.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done - -installcheck-binPROGRAMS: $(bin_PROGRAMS) - bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ - case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ - *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ - esac; \ - f=`echo "$$p" | \ - sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - for opt in --help --version; do \ - if "$(DESTDIR)$(bindir)/$$f" $$opt >c$${pid}_.out \ - 2>c$${pid}_.err </dev/null \ - && test -n "`cat c$${pid}_.out`" \ - && test -z "`cat c$${pid}_.err`"; then :; \ - else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ - done; \ - done; rm -f c$${pid}_.???; exit $$bad -gappletviewer$(EXEEXT): $(gappletviewer_OBJECTS) $(gappletviewer_DEPENDENCIES) - @rm -f gappletviewer$(EXEEXT) - $(LINK) $(gappletviewer_LDFLAGS) $(gappletviewer_OBJECTS) $(gappletviewer_LDADD) $(LIBS) -gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) - @rm -f gjarsigner$(EXEEXT) - $(LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS) -gkeytool$(EXEEXT): $(gkeytool_OBJECTS) $(gkeytool_DEPENDENCIES) - @rm -f gkeytool$(EXEEXT) - $(LINK) $(gkeytool_LDFLAGS) $(gkeytool_OBJECTS) $(gkeytool_LDADD) $(LIBS) -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gappletviewer-toolwrapper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gjarsigner-toolwrapper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gkeytool-toolwrapper.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -gappletviewer-toolwrapper.o: toolwrapper.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gappletviewer_CFLAGS) $(CFLAGS) -MT gappletviewer-toolwrapper.o -MD -MP -MF "$(DEPDIR)/gappletviewer-toolwrapper.Tpo" -c -o gappletviewer-toolwrapper.o `test -f 'toolwrapper.c' || echo '$(srcdir)/'`toolwrapper.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gappletviewer-toolwrapper.Tpo" "$(DEPDIR)/gappletviewer-toolwrapper.Po"; else rm -f "$(DEPDIR)/gappletviewer-toolwrapper.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='toolwrapper.c' object='gappletviewer-toolwrapper.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gappletviewer_CFLAGS) $(CFLAGS) -c -o gappletviewer-toolwrapper.o `test -f 'toolwrapper.c' || echo '$(srcdir)/'`toolwrapper.c - -gappletviewer-toolwrapper.obj: toolwrapper.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gappletviewer_CFLAGS) $(CFLAGS) -MT gappletviewer-toolwrapper.obj -MD -MP -MF "$(DEPDIR)/gappletviewer-toolwrapper.Tpo" -c -o gappletviewer-toolwrapper.obj `if test -f 'toolwrapper.c'; then $(CYGPATH_W) 'toolwrapper.c'; else $(CYGPATH_W) '$(srcdir)/toolwrapper.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gappletviewer-toolwrapper.Tpo" "$(DEPDIR)/gappletviewer-toolwrapper.Po"; else rm -f "$(DEPDIR)/gappletviewer-toolwrapper.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='toolwrapper.c' object='gappletviewer-toolwrapper.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gappletviewer_CFLAGS) $(CFLAGS) -c -o gappletviewer-toolwrapper.obj `if test -f 'toolwrapper.c'; then $(CYGPATH_W) 'toolwrapper.c'; else $(CYGPATH_W) '$(srcdir)/toolwrapper.c'; fi` - -gjarsigner-toolwrapper.o: toolwrapper.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gjarsigner_CFLAGS) $(CFLAGS) -MT gjarsigner-toolwrapper.o -MD -MP -MF "$(DEPDIR)/gjarsigner-toolwrapper.Tpo" -c -o gjarsigner-toolwrapper.o `test -f 'toolwrapper.c' || echo '$(srcdir)/'`toolwrapper.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gjarsigner-toolwrapper.Tpo" "$(DEPDIR)/gjarsigner-toolwrapper.Po"; else rm -f "$(DEPDIR)/gjarsigner-toolwrapper.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='toolwrapper.c' object='gjarsigner-toolwrapper.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gjarsigner_CFLAGS) $(CFLAGS) -c -o gjarsigner-toolwrapper.o `test -f 'toolwrapper.c' || echo '$(srcdir)/'`toolwrapper.c - -gjarsigner-toolwrapper.obj: toolwrapper.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gjarsigner_CFLAGS) $(CFLAGS) -MT gjarsigner-toolwrapper.obj -MD -MP -MF "$(DEPDIR)/gjarsigner-toolwrapper.Tpo" -c -o gjarsigner-toolwrapper.obj `if test -f 'toolwrapper.c'; then $(CYGPATH_W) 'toolwrapper.c'; else $(CYGPATH_W) '$(srcdir)/toolwrapper.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gjarsigner-toolwrapper.Tpo" "$(DEPDIR)/gjarsigner-toolwrapper.Po"; else rm -f "$(DEPDIR)/gjarsigner-toolwrapper.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='toolwrapper.c' object='gjarsigner-toolwrapper.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gjarsigner_CFLAGS) $(CFLAGS) -c -o gjarsigner-toolwrapper.obj `if test -f 'toolwrapper.c'; then $(CYGPATH_W) 'toolwrapper.c'; else $(CYGPATH_W) '$(srcdir)/toolwrapper.c'; fi` - -gkeytool-toolwrapper.o: toolwrapper.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkeytool_CFLAGS) $(CFLAGS) -MT gkeytool-toolwrapper.o -MD -MP -MF "$(DEPDIR)/gkeytool-toolwrapper.Tpo" -c -o gkeytool-toolwrapper.o `test -f 'toolwrapper.c' || echo '$(srcdir)/'`toolwrapper.c; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gkeytool-toolwrapper.Tpo" "$(DEPDIR)/gkeytool-toolwrapper.Po"; else rm -f "$(DEPDIR)/gkeytool-toolwrapper.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='toolwrapper.c' object='gkeytool-toolwrapper.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkeytool_CFLAGS) $(CFLAGS) -c -o gkeytool-toolwrapper.o `test -f 'toolwrapper.c' || echo '$(srcdir)/'`toolwrapper.c - -gkeytool-toolwrapper.obj: toolwrapper.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkeytool_CFLAGS) $(CFLAGS) -MT gkeytool-toolwrapper.obj -MD -MP -MF "$(DEPDIR)/gkeytool-toolwrapper.Tpo" -c -o gkeytool-toolwrapper.obj `if test -f 'toolwrapper.c'; then $(CYGPATH_W) 'toolwrapper.c'; else $(CYGPATH_W) '$(srcdir)/toolwrapper.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/gkeytool-toolwrapper.Tpo" "$(DEPDIR)/gkeytool-toolwrapper.Po"; else rm -f "$(DEPDIR)/gkeytool-toolwrapper.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='toolwrapper.c' object='gkeytool-toolwrapper.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gkeytool_CFLAGS) $(CFLAGS) -c -o gkeytool-toolwrapper.obj `if test -f 'toolwrapper.c'; then $(CYGPATH_W) 'toolwrapper.c'; else $(CYGPATH_W) '$(srcdir)/toolwrapper.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -583,71 +399,12 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -install-TOOLSDATA: $(TOOLS_DATA) - @$(NORMAL_INSTALL) - test -z "$(TOOLSdir)" || $(mkdir_p) "$(DESTDIR)$(TOOLSdir)" - @list='$(TOOLS_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(TOOLSDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(TOOLSdir)/$$f'"; \ - $(TOOLSDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(TOOLSdir)/$$f"; \ - done - -uninstall-TOOLSDATA: - @$(NORMAL_UNINSTALL) - @list='$(TOOLS_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(TOOLSdir)/$$f'"; \ - rm -f "$(DESTDIR)$(TOOLSdir)/$$f"; \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique tags: TAGS +TAGS: -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +CTAGS: + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -682,11 +439,8 @@ distdir: $(DISTFILES) check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) +all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(TOOLSdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -715,14 +469,11 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \ - mostlyclean-am +clean-am: clean-generic clean-libtool clean-local mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags +distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -734,25 +485,23 @@ info: info-am info-am: -install-data-am: install-TOOLSDATA +install-data-am: -install-exec-am: install-binPROGRAMS install-binSCRIPTS +install-exec-am: install-info: install-info-am install-man: -installcheck-am: installcheck-binPROGRAMS installcheck-binSCRIPTS +installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool +mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-am @@ -762,26 +511,23 @@ ps: ps-am ps-am: -uninstall-am: uninstall-TOOLSDATA uninstall-binPROGRAMS \ - uninstall-binSCRIPTS uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool clean-local ctags dist-hook \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-TOOLSDATA install-am \ - install-binPROGRAMS install-binSCRIPTS install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installcheck-binPROGRAMS \ - installcheck-binSCRIPTS installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local dist-hook distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-TOOLSDATA uninstall-am \ - uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-info-am + uninstall uninstall-am uninstall-info-am @FOUND_ECJ_FALSE@@FOUND_GCJX_FALSE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE@error dunno how to setup the JCOMPILER and compile +# Where we want these data files installed. +# TOOLSdir = $(datadir)/java + # Make sure everything is included in the distribution. dist-hook: srcdir_cnt=`echo $(srcdir) | wc -c`; \ |