diff options
Diffstat (limited to 'libjava/classpath/lib/Makefile.in')
| -rw-r--r-- | libjava/classpath/lib/Makefile.in | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index 94709eb3e0f..75f7871c8de 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -39,7 +39,8 @@ host_triplet = @host@ target_triplet = @target@ subdir = lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in + $(srcdir)/copy-vmresources.sh.in $(srcdir)/gen-classlist.sh.in \ + $(srcdir)/mkcollections.pl.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ @@ -52,7 +53,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/config.h -CONFIG_CLEAN_FILES = gen-classlist.sh copy-vmresources.sh +CONFIG_CLEAN_FILES = mkcollections.pl gen-classlist.sh \ + copy-vmresources.sh SOURCES = DIST_SOURCES = DATA = $(noinst_DATA) @@ -74,6 +76,7 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CLASSPATH_INCLUDES = @CLASSPATH_INCLUDES@ CLASSPATH_MODULE = @CLASSPATH_MODULE@ +COLLECTIONS_PREFIX = @COLLECTIONS_PREFIX@ CP = @CP@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -81,6 +84,8 @@ CREATE_ALSA_LIBRARIES_FALSE = @CREATE_ALSA_LIBRARIES_FALSE@ CREATE_ALSA_LIBRARIES_TRUE = @CREATE_ALSA_LIBRARIES_TRUE@ CREATE_API_DOCS_FALSE = @CREATE_API_DOCS_FALSE@ CREATE_API_DOCS_TRUE = @CREATE_API_DOCS_TRUE@ +CREATE_COLLECTIONS_FALSE = @CREATE_COLLECTIONS_FALSE@ +CREATE_COLLECTIONS_TRUE = @CREATE_COLLECTIONS_TRUE@ CREATE_CORE_JNI_LIBRARIES_FALSE = @CREATE_CORE_JNI_LIBRARIES_FALSE@ CREATE_CORE_JNI_LIBRARIES_TRUE = @CREATE_CORE_JNI_LIBRARIES_TRUE@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@ @@ -111,6 +116,7 @@ EGREP = @EGREP@ ERROR_CFLAGS = @ERROR_CFLAGS@ EXAMPLESDIR = @EXAMPLESDIR@ EXEEXT = @EXEEXT@ +FASTJAR = @FASTJAR@ FIND = @FIND@ FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@ @@ -122,6 +128,8 @@ FOUND_JIKES_FALSE = @FOUND_JIKES_FALSE@ FOUND_JIKES_TRUE = @FOUND_JIKES_TRUE@ FOUND_KJC_FALSE = @FOUND_KJC_FALSE@ FOUND_KJC_TRUE = @FOUND_KJC_TRUE@ +FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@ +FREETYPE2_LIBS = @FREETYPE2_LIBS@ GCJ = @GCJ@ GCJX = @GCJX@ GJDOC = @GJDOC@ @@ -172,6 +180,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PANGOFT2_CFLAGS = @PANGOFT2_CFLAGS@ PANGOFT2_LIBS = @PANGOFT2_LIBS@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PERL = @PERL@ PKG_CONFIG = @PKG_CONFIG@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ @@ -254,7 +263,7 @@ propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-I 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) +compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB) @FOUND_ECJ_TRUE@@FOUND_GCJX_FALSE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE@@FOUND_KJC_FALSE@JAVAC = $(ECJ) -source 1.4 -encoding UTF-8 -warn:-deprecation,serial,unused -proceedOnError -bootclasspath '' -classpath $(compile_classpath) -d . @classes @FOUND_GCJX_TRUE@@FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE@@FOUND_KJC_FALSE@JAVAC = $(GCJX) -g -encoding UTF-8 -classpath .:$(USER_CLASSLIB) -d . @classes @FOUND_GCJ_FALSE@@FOUND_JIKES_FALSE@@FOUND_KJC_TRUE@JAVAC = $(KJC) -classpath .:$(USER_CLASSLIB) -d . @classes @@ -263,6 +272,7 @@ compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$ # handling source to bytecode compiler programs like gcj, jikes and kjc @FOUND_GCJ_TRUE@JAVAC = exit 1 JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB) +@CREATE_COLLECTIONS_TRUE@COLLECTIONS = collections.jar @BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ @@ -302,6 +312,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +mkcollections.pl: $(top_builddir)/config.status $(srcdir)/mkcollections.pl.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ gen-classlist.sh: $(top_builddir)/config.status $(srcdir)/gen-classlist.sh.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ copy-vmresources.sh: $(top_builddir)/config.status $(srcdir)/copy-vmresources.sh.in @@ -444,6 +456,16 @@ uninstall-am: uninstall-info-am uninstall-local sinclude $(JAVA_DEPEND) +@CREATE_COLLECTIONS_TRUE@collections.jar: mkcollections.pl +@CREATE_COLLECTIONS_TRUE@ ./mkcollections.pl $(top_srcdir) +@CREATE_COLLECTIONS_TRUE@@FOUND_GCJ_TRUE@ $(GCJ) -C `$(FIND) $(COLLECTIONS_PREFIX) -name '*' -type f -print` +@CREATE_COLLECTIONS_TRUE@@FOUND_GCJ_FALSE@ $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*' -type f -print` +@CREATE_COLLECTIONS_TRUE@ if test "$(FASTJAR)" != ""; then \ +@CREATE_COLLECTIONS_TRUE@ $(FASTJAR) cf $@ $(COLLECTIONS_PREFIX); \ +@CREATE_COLLECTIONS_TRUE@ else \ +@CREATE_COLLECTIONS_TRUE@ echo "fastjar not found" > collections.jar; \ +@CREATE_COLLECTIONS_TRUE@ fi + @INSTALL_CLASS_FILES_TRUE@install-data-local: genclasses compile-classes @INSTALL_CLASS_FILES_TRUE@ -$(top_srcdir)/mkinstalldirs $(DESTDIR)$(pkgdatadir) @INSTALL_CLASS_FILES_TRUE@ cp -R gnu $(DESTDIR)$(pkgdatadir) @@ -464,6 +486,7 @@ sinclude $(JAVA_DEPEND) glibj.zip: classes compile-classes resources if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi + if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org META-INF; fi resources: copy-vmresources.sh if ! [ -e gnu ]; then mkdir gnu; fi |