X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2FMakefile.am;h=c4746bfd854faa4d37be7c3dfd5ac1812aaec440;hb=aa5ba529bfbdf6fa40c52260fa02cb22ba9b5e7c;hp=eed4f6bb00dc646a90a317abb36761ecbb88c6bd;hpb=72b3fc432141c1b4fe54f39eeb29a59b7123a18e;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libjava/Makefile.am b/libjava/Makefile.am index eed4f6bb00d..c4746bfd854 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects -ACLOCAL_AMFLAGS = -I . -I .. -I ../config +ACLOCAL_AMFLAGS = -I . -I .. -I ../config -I libltdl # May be used by various substitution variables. gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) @@ -13,13 +13,20 @@ SUBDIRS += testsuite endif # write_entries_to_file - writes each entry in a list -# to the specified file. Each entry is written individually -# to accomodate systems with severe command-line-length -# limitations. +# to the specified file. Entries are written in chunks of +# $(write_entries_to_file_split) to accomodate systems with +# severe command-line-length limitations. # Parameters: # $(1): variable containing entries to iterate over # $(2): output file -write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2))) +write_entries_to_file_split = 50 +write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) \ + $(foreach range, \ + $(shell i=1; while test $$i -le $(words $(1)); do \ + echo $$i; i=`expr $$i + $(write_entries_to_file_split)`; done), \ + $(shell echo $(wordlist $(range), \ + $(shell expr $(range) + $(write_entries_to_file_split) - 1), $(1)) \ + | tr ' ' '\n' >> $(2))) ## ################################################################ @@ -67,20 +74,35 @@ endif ## Name of the default .db. db_name = classmap.db ## Compiler specific component of the .db file -db_pathtail = gcj-$(gcc_version)/$(db_name) +gcjsubdir = @gcjsubdir@ +db_pathtail = $(gcjsubdir)/$(db_name) ## For now, only on native systems. FIXME. if NATIVE -bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \ - gappletviewer gjarsigner gkeytool gjar gjavah gnative2ascii \ - gorbd grmid gserialver gtnameserv +bin_programs = jv-convert gij grmic grmiregistry gcj-dbtool \ + gappletviewer gjarsigner gkeytool gjar gcjh gjavah gnative2ascii \ + gorbd grmid gserialver gtnameserv gc-analyze +if CREATE_GJDOC +bin_programs += gjdoc +endif + +noinst_PROGRAMS = +if INSTALL_BINARIES +bin_PROGRAMS = $(bin_programs) +else +noinst_PROGRAMS += $(bin_programs) +endif ## It is convenient to actually build and install the default database ## when gcj-dbtool is available. dbexec_DATA = $(db_name) -endif +endif + +bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile -bin_SCRIPTS = addr2name.awk +if INSTALL_AOT_RPM +bin_SCRIPTS += contrib/aot-compile-rpm +endif if BUILD_ECJ1 ## We build ecjx and not ecj1 because in one mode, ecjx will not work @@ -95,22 +117,26 @@ endif ## Compilers and compilation flags. ## -if BASH_JAR -bin_SCRIPTS += scripts/jar -endif - ## The compiler with whatever flags we want for both -c and -C ## compiles. GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated extra_ldflags_libjava = @extra_ldflags_libjava@ +extra_ldflags = @extra_ldflags@ +if ANONVERSCRIPT +extra_ldflags_libjava += -Wl,--version-script=$(srcdir)/libgcj.ver +endif + +LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \ - $(LDFLAGS) -o $@ + $(LTLDFLAGS) -o $@ GCJ_FOR_ECJX = @GCJ_FOR_ECJX@ GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \ - $(LDFLAGS) $(extra_ldflags_libjava) -o $@ + $(LTLDFLAGS) $(extra_ldflags_libjava) $(extra_ldflags) -o $@ +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LTLDFLAGS) -o $@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@ @@ -139,6 +165,7 @@ AM_CXXFLAGS = \ -DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \ -DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \ -DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \ + -DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \ -DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \ -DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" @@ -153,6 +180,18 @@ if USING_GCC AM_CFLAGS += $(WARNINGS) endif +if SUPPRESS_LIBGCJ_BC +LIBGCJ_BC_FLAGS = +else +LIBGCJ_BC_FLAGS = -findirect-dispatch -fno-indirect-classes +endif + +if BUILD_LIBGCJ_REDUCED_REFLECTION +LIBGCJ_REDUCED_REFLECTION_FLAGS = -freduced-reflection +else +LIBGCJ_REDUCED_REFLECTION_FLAGS = +endif + ## Extra CFLAGS used for JNI C sources shared with GNU Classpath. PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long @@ -185,10 +224,19 @@ libgij_la_LIBADD = -L$(here)/.libs libgcj.la libgij_la_LDFLAGS = -rpath $(toolexeclibdir) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC) -libgcj_la_SOURCES = prims.cc jni.cc jvmti.cc exception.cc stacktrace.cc \ - link.cc defineclass.cc interpret.cc verify.cc \ +if INTERPRETER +libgcj_interpret_source_files = jvmti.cc interpret.cc +else +libgcj_interpret_source_files = +endif + +libgcj_la_SOURCES = prims.cc jni.cc exception.cc stacktrace.cc \ + link.cc defineclass.cc verify.cc $(libgcj_interpret_source_files) \ $(nat_source_files) +## We need to compile at least the interpreter this way. +interpret.lo: AM_CXXFLAGS += -fwrapv + if USING_BOEHMGC libgcj_la_SOURCES += boehm.cc endif @@ -228,7 +276,7 @@ xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) # Include THREADLIBS here to ensure that the correct version of # certain linuxthread functions get linked: ## The mysterious backslash in the grep pattern is consumed by make. -libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ +libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \ $(LIBLTDL) $(SYS_ZLIBS) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) @@ -240,13 +288,16 @@ libgcj_la_LIBADD = \ $(all_packages_source_files:.list=.lo) \ $(bc_objects) \ $(propertyo_files) \ - $(LIBMAGIC) $(LIBFFI) $(ZLIBS) $(GCLIBS) + $(LIBFFI) $(ZLIBS) $(GCLIBS) libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ java/lang/Object.lo \ java/lang/Class.lo \ java/process-$(PLATFORM).lo \ $(all_packages_source_files:.list=.lo) \ $(LIBLTDL) $(libgcj_la_LIBADD) +if ANONVERSCRIPT +libgcj_la_DEPENDENCIES += $(srcdir)/libgcj.ver +endif libgcj_la_LINK = $(LIBLINK) ## A hack to make sure the various gcj-related macros, like @@ -333,8 +384,9 @@ $(propertyo_files): %.lo: classpath/resource/% libgcj-$(gcc_version).jar: classpath/lib/compile-classes ## Note that this now omits the property files. ## It doesn't matter since we don't use the jar at runtime. - here=`pwd`; cd $(srcdir)/classpath/lib; $(JAR) -cfM \ - $$here/libgcj-$(gcc_version).jar gnu java javax org sun + here=`pwd`; cd $(srcdir)/classpath/lib; \ + find gnu java javax org sun -name .svn -prune -o -name '*.class' -print | \ + $(JAR) -cfM@ $$here/libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar: classpath/tools/tools.zip cp $< $@ @@ -344,7 +396,7 @@ DISTCLEANFILES = native.dirs mostlyclean-local: ## Use libtool rm to remove each libtool object - find . -name '*.lo' -print | xargs $(LIBTOOL) rm -f + find . -name '*.lo' -print | xargs $(LIBTOOL) --mode=clean rm -f distclean-local: ## Remove every .d file that was created. @@ -368,8 +420,13 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND ## Compiling a list of java sources to a single .o. +# Concurrent things use reflection internally. +java/util/concurrent.lo \ +java/util/concurrent/atomic.lo \ +java/util/concurrent/locks.lo: LIBGCJ_REDUCED_REFLECTION_FLAGS = + %.lo: %.list - $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(here)/classpath/lib/classes -MT $@ -MD -MP -MF $(basename $@).deps @$< + $(LTGCJCOMPILE) $(LIBGCJ_REDUCED_REFLECTION_FLAGS) -c -o $@ -fsource-filename=$(here)/classpath/lib/classes -MT $@ -MD -MP -MF $(basename $@).deps @$< java/lang/Object.lo: classpath/lib/java/lang/Object.class $(LTGCJCOMPILE) -c -o $@ -fsource-filename=$(srcdir)/$(basename $@).java $< @@ -394,24 +451,12 @@ omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \ java/lang/reflect/Field.h java/lang/reflect/Method.h \ java/lang/reflect/Proxy.h gnu/gcj/runtime/ExtensionClassLoader.h -generic_header_files = $(ordinary_header_files) $(xlib_nat_headers) - -MYGCJH = gjavah - -$(generic_header_files): gcjh.stamp - -gcjh.stamp: classpath/lib/compile-classes -if JAVA_MAINTAINER_MODE - $(MYGCJH) --cni --all $(srcdir)/classpath/lib \ - --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force -endif - echo > gcjh.stamp - inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectInputStream$$GetField.h \ java/nio/DirectByteBufferImpl$$ReadWrite.h \ java/nio/channels/Pipe$$SinkChannel.h \ java/nio/channels/Pipe$$SourceChannel.h \ + java/lang/VMProcess$ImmediateEOFInputStream.h \ java/lang/reflect/Proxy$$ProxyData.h \ java/lang/reflect/Proxy$$ProxyType.h \ gnu/java/net/PlainSocketImpl$$SocketInputStream.h \ @@ -419,6 +464,20 @@ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ gnu/java/nio/PipeImpl$$SinkChannelImpl.h \ gnu/java/nio/PipeImpl$$SourceChannelImpl.h +generic_header_files = $(ordinary_header_files) $(inner_nat_headers) \ + $(xlib_nat_headers) + +MYGCJH = gjavah + +$(generic_header_files): gcjh.stamp + +gcjh.stamp: classpath/lib/compile-classes +if JAVA_MAINTAINER_MODE + $(MYGCJH) --cni --all $(srcdir)/classpath/lib \ + --cmdfile=$(srcdir)/headers.txt -d $(srcdir) --force +endif + echo > gcjh.stamp + nat_headers = $(ordinary_header_files) $(inner_nat_headers) nat_headers_install = $(ordinary_header_files) @@ -430,7 +489,8 @@ extra_headers = java/lang/Object.h java/lang/Class.h $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: @: -install-exec-hook: install-toolexeclibLTLIBRARIES install-libexecsubPROGRAMS +install-exec-hook: install-binPROGRAMS install-toolexeclibLTLIBRARIES \ + install-libexecsubPROGRAMS ## Support for libgcj_bc: dummy shared library used only at link-time. if USE_LIBGCJ_BC ## Install libgcj_bc dummy lib in the target directory. We also need to delete @@ -446,16 +506,14 @@ if USE_LIBGCJ_BC rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la; endif if BUILD_ECJ1 -if NATIVE +## Undo any prepending of the target prefix and transform +## to the actual host's executable suffix. mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) -else !NATIVE -## Undo the prepending of the target prefix - mv $(DESTDIR)$(libexecsubdir)/$(target_noncanonical)-`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) -endif !NATIVE endif BUILD_ECJ1 ## Install the headers. It is fairly ugly that we have to do this by ## hand. +install_data_local_split = 50 install-data-local: $(PRE_INSTALL) ## Install the .pc file. @@ -468,12 +526,23 @@ install-data-local: ## length limit of some shells. @echo Creating list of headers to install... @: $(call write_entries_to_file,$(nat_headers_install) $(extra_headers),tmp-ilist) - @cat tmp-ilist | while read f; do \ - d="`echo $$f | sed -e 's,/[^/]*$$,,'`"; \ - $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$d; \ - if test -f $(srcdir)/$$f; then p=$(srcdir)/$$f; else p=$$f; fi; \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(gxx_include_dir)/$$f; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + while read file; do echo "$$file $$file"; done < tmp-ilist | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } \ + { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(install_data_local_split)) { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' | \ + while read dir files; do \ + xfiles=; for file in $$files; do \ + if test -f "$$file"; then xfiles="$$xfiles $$file"; \ + else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ + test -z "$$xfiles" || { \ + test "x$$dir" = x. || { \ + echo "$(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$dir"; \ + $(mkinstalldirs) $(DESTDIR)$(gxx_include_dir)/$$dir; }; \ + echo " $(INSTALL_DATA) $$xfiles $(DESTDIR)$(gxx_include_dir)/$$dir"; \ + $(INSTALL_DATA) $$xfiles $(DESTDIR)$(gxx_include_dir)/$$dir; }; \ done -@rm -f tmp-ilist ## Install inner class headers. @@ -488,7 +557,134 @@ install-data-local: $(INSTALL_DATA) $(srcdir)/'gnu/java/nio/PipeImpl$$SinkChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/ $(INSTALL_DATA) $(srcdir)/'gnu/java/nio/PipeImpl$$SourceChannelImpl.h' $(DESTDIR)$(gxx_include_dir)/gnu/java/nio/ ## Don't install java/nio/DirectByteBufferImpl$$ReadWrite.h here. It's for internal use only. - +## Install Python modules for aot-compile. + $(mkinstalldirs) $(DESTDIR)$(python_mod_dir); \ + $(INSTALL_DATA) $(srcdir)/contrib/classfile.py \ + $(DESTDIR)$(python_mod_dir)/classfile.py; \ + $(INSTALL_DATA) contrib/aotcompile.py \ + $(DESTDIR)$(python_mod_dir)/aotcompile.py; +if CREATE_JAVA_HOME +## Create sdk style directories + $(mkinstalldirs) $(DESTDIR)$(JRE_BIN_DIR) + $(mkinstalldirs) $(DESTDIR)$(SDK_BIN_DIR) + $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR) + $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU) + $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR) + $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/$(OS) + relative() { \ + $(PERL) -e 'use File::Spec; \ + print File::Spec->abs2rel($$ARGV[0], $$ARGV[1])' $$1 $$2; \ + }; \ + RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \ + ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/java; \ + ln -sf $$RELATIVE/`echo gjar | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/jar; \ + ln -sf $$RELATIVE/`echo gjdoc | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/javadoc; \ + ln -sf $$RELATIVE/`echo grmic | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/rmic; \ + ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/javah; \ + ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \ + ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/jarsigner; \ + ln -sf $$RELATIVE/`echo grmiregistry | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/rmiregistry; \ + ln -sf $$RELATIVE/`echo gkeytool | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/keytool; \ + ln -sf $$RELATIVE/`echo gorbd | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/orbd; \ + ln -sf $$RELATIVE/`echo gnative2ascii | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/native2ascii; \ + ln -sf $$RELATIVE/`echo grmid | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/rmid; \ + ln -sf $$RELATIVE/`echo gtnameserv | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/tnameserv; \ + ln -sf $$RELATIVE/`echo gserialver | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(SDK_BIN_DIR)/serialver; \ + RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(JRE_BIN_DIR)); \ + ln -sf $$RELATIVE/`echo grmiregistry | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(JRE_BIN_DIR)/rmiregistry; \ + ln -sf $$RELATIVE/`echo gkeytool | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(JRE_BIN_DIR)/keytool; \ + ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(JRE_BIN_DIR)/java; \ + ln -sf $$RELATIVE/`echo gorbd | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(JRE_BIN_DIR)/orbd; \ + ln -sf $$RELATIVE/`echo grmid | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(JRE_BIN_DIR)/rmid; \ + ln -sf $$RELATIVE/`echo gtnameserv | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \ + $(DESTDIR)$(JRE_BIN_DIR)/tnameserv; \ + $(mkinstalldirs) $(DESTDIR)$(JVM_JAR_DIR); \ + version=$(JAVA_VERSION).$(BUILD_VERSION); \ + working_dir=`pwd`; \ + cd $(DESTDIR)$(JVM_JAR_DIR); \ + RELATIVE=$$(relative $(DESTDIR)$(JRE_LIB_DIR) \ + $(DESTDIR)$(JVM_JAR_DIR)); \ + for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \ + jndi-ldap jndi-rmi jsse sasl; \ + do \ + ln -sf $$RELATIVE/rt.jar $$jarname-$$version.jar; \ + done; \ + RELATIVE=$$(relative $(DESTDIR)$(jardir) \ + $(DESTDIR)$(JVM_JAR_DIR)); \ + for jar in *-$$version.jar; \ + do \ + ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|-$(JAVA_VERSION).jar|g"); \ + ln -sf $$jar $$(echo $$jar | sed "s|-$$version.jar|.jar|g"); \ + done; \ + cd $$working_dir; \ + $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \ + RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \ + $(DESTDIR)$(JRE_LIB_DIR)/security); \ + cd $(DESTDIR)$(JRE_LIB_DIR)/security; \ + ln -sf $$RELATIVE/classpath.security java.security; \ + cd $$working_dir; \ + $(mkinstalldirs) $(DESTDIR)$(SDK_INCLUDE_DIR)/linux; \ + $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client; \ + $(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server; \ + $(mkinstalldirs) $(DESTDIR)$(SDK_LIB_DIR); \ + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \ + $(DESTDIR)$(JRE_LIB_DIR)); \ + ln -sf $$RELATIVE/libgcj-$(gcc_version).jar \ + $(DESTDIR)$(JRE_LIB_DIR)/rt.jar; \ + RELATIVE=$$(relative $(DESTDIR)$(dbexecdir) \ + $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)); \ + ln -sf $$RELATIVE/libjawt.so \ + $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/libjawt.so; \ + RELATIVE=$$(relative $(DESTDIR)$(dbexecdir) \ + $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client); \ + ln -sf $$RELATIVE/libjvm.so \ + $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/client/libjvm.so; \ + RELATIVE=$$(relative $(DESTDIR)$(dbexecdir) \ + $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server); \ + ln -sf $$RELATIVE/libjvm.so \ + $(DESTDIR)$(JRE_LIB_DIR)/$(CPU)/server/libjvm.so; \ + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \ + $(DESTDIR)$(SDK_LIB_DIR)); \ + ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \ + $(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \ + for headername in jawt jni; do \ + DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \ + -print-file-name=include/$$headername.h)); \ + RELATIVE=$$(relative $$DIRECTORY \ + $(DESTDIR)$(SDK_INCLUDE_DIR)); \ + ln -sf $$RELATIVE/$$headername.h \ + $(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \ + done; \ + for headername in jawt_md jni_md; do \ + DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \ + -print-file-name=include/$$headername.h)); \ + RELATIVE=$$(relative $$DIRECTORY \ + $(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \ + ln -sf $$RELATIVE/$$headername.h \ + $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \ + done; \ + RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \ + $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); +endif ## ################################################################ @@ -545,11 +741,12 @@ write-entries-to-file-check: ## systems. if NATIVE if MAINTAINER_MODE -noinst_PROGRAMS = gen-from-JIS +noinst_PROGRAMS += gen-from-JIS gen_from_JIS_SOURCES = \ gnu/gcj/convert/gen-from-JIS.c \ - gnu/gcj/convert/make-trie.c + gnu/gcj/convert/make-trie.c \ + gnu/gcj/convert/make-trie.h gen_from_JIS_DEPENDENCIES = \ gnu/gcj/convert/JIS0201.h \ @@ -607,7 +804,7 @@ jv_convert_SOURCES = ## need this because we are explicitly using libtool to link using the ## `.la' file. jv_convert_LDFLAGS = --main=gnu.gcj.convert.Convert \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) jv_convert_LINK = $(GCJLINK) ## We don't explicitly link in the libraries we need; libgcj.la brings ## in all dependencies. We need the -L so that gcj can find libgcj @@ -628,7 +825,7 @@ gnu/gcj/tools/gcj_dbtool/natMain.cc ## need this because we are explicitly using libtool to link using the ## `.la' file. gcj_dbtool_LDFLAGS = --main=gnu.gcj.tools.gcj_dbtool.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gcj_dbtool_LINK = $(GCJLINK) ## We don't explicitly link in the libraries we need; libgcj.la brings ## in all dependencies. We need the -L so that gcj can find libgcj @@ -642,12 +839,27 @@ gcj_dbtool_LDADD = gnu/gcj/tools/gcj_dbtool.lo -L$(here)/.libs libgcj.la ## linking this program. gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo libgcj.la libgcj.spec +gc_analyze_SOURCES = + +## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We +## need this because we are explicitly using libtool to link using the +## `.la' file. +gc_analyze_LDFLAGS = --main=gnu.gcj.tools.gc_analyze.MemoryAnalyze \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) +gc_analyze_LINK = $(GCJLINK) +## See jv_convert_LDADD. +gc_analyze_LDADD = -L$(here)/.libs libgcj-tools.la libgcj.la +## Depend on the spec file to make sure it is up to date before +## linking this program. +gc_analyze_DEPENDENCIES = libgcj-tools.la libgcj.la libgcj.spec + gij_SOURCES = ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'. We ## need this because we are explicitly using libtool to link using the ## `.la' file. -gij_LDFLAGS = -rpath $(libdir)/gcj-$(gcc_version) -rpath $(toolexeclibdir) \ - -shared-libgcc $(THREADLDFLAGS) +gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \ + -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) \ + $(extra_gij_ldflags) gij_LINK = $(GCJLINK) ## See jv_convert_LDADD. gij_LDADD = -L$(here)/.libs libgij.la @@ -656,7 +868,7 @@ gij_LDADD = -L$(here)/.libs libgij.la gij_DEPENDENCIES = libgij.la ## Build an ecjx from a .jar. -ecjx_SOURCES = +ecjx_SOURCES = ecjx.cc ## We use the BC ABI here so that we don't need to compile ecj.jar. ## Hopefully the user has compiled it into his system .db. ## However, even if not it will run reasonably quickly. @@ -676,8 +888,13 @@ else !ENABLE_SHARED ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH) endif !ENABLE_SHARED -ecjx_LDADD = -L$(here)/.libs libgcj.la +ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) ecjx_DEPENDENCIES = libgcj.la libgcj.spec +if USE_LIBGCJ_BC +ecjx_DEPENDENCIES += libgcj_bc.la +else +ecjx_LDADD += libgcj.la +endif else !NATIVE @@ -691,7 +908,7 @@ endif !NATIVE ## This is a dummy definition. gappletviewer_SOURCES = gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gappletviewer_LINK = $(GCJLINK) ## See jv_convert_LDADD. gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la @@ -700,7 +917,7 @@ 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) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gjarsigner_LINK = $(GCJLINK) ## See jv_convert_LDADD. gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la @@ -709,7 +926,7 @@ 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) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gkeytool_LINK = $(GCJLINK) ## See jv_convert_LDADD. gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la @@ -718,7 +935,7 @@ gkeytool_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gjar_SOURCES = gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gjar_LINK = $(GCJLINK) ## See jv_convert_LDADD. gjar_LDADD = -L$(here)/.libs libgcj-tools.la @@ -727,16 +944,25 @@ gjar_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gjavah_SOURCES = gjavah_LDFLAGS = --main=gnu.classpath.tools.javah.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gjavah_LINK = $(GCJLINK) ## See jv_convert_LDADD. gjavah_LDADD = -L$(here)/.libs libgcj-tools.la gjavah_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. +gcjh_SOURCES = +gcjh_LDFLAGS = --main=gnu.classpath.tools.javah.GcjhMain \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) +gcjh_LINK = $(GCJLINK) +## See jv_convert_LDADD. +gcjh_LDADD = -L$(here)/.libs libgcj-tools.la +gcjh_DEPENDENCIES = libgcj-tools.la + +## This is a dummy definition. gnative2ascii_SOURCES = gnative2ascii_LDFLAGS = --main=gnu.classpath.tools.native2ascii.Native2ASCII \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gnative2ascii_LINK = $(GCJLINK) ## See jv_convert_LDADD. gnative2ascii_LDADD = -L$(here)/.libs libgcj-tools.la @@ -745,7 +971,7 @@ gnative2ascii_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gorbd_SOURCES = gorbd_LDFLAGS = --main=gnu.classpath.tools.orbd.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gorbd_LINK = $(GCJLINK) ## See jv_convert_LDADD. gorbd_LDADD = -L$(here)/.libs libgcj-tools.la @@ -754,7 +980,7 @@ gorbd_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. grmid_SOURCES = grmid_LDFLAGS = --main=gnu.classpath.tools.rmid.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) grmid_LINK = $(GCJLINK) ## See jv_convert_LDADD. grmid_LDADD = -L$(here)/.libs libgcj-tools.la @@ -763,7 +989,7 @@ grmid_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gserialver_SOURCES = gserialver_LDFLAGS = --main=gnu.classpath.tools.serialver.SerialVer \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gserialver_LINK = $(GCJLINK) ## See jv_convert_LDADD. gserialver_LDADD = -L$(here)/.libs libgcj-tools.la @@ -772,7 +998,7 @@ gserialver_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. gtnameserv_SOURCES = gtnameserv_LDFLAGS = --main=gnu.classpath.tools.tnameserv.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) gtnameserv_LINK = $(GCJLINK) ## See jv_convert_LDADD. gtnameserv_LDADD = -L$(here)/.libs libgcj-tools.la @@ -781,7 +1007,7 @@ gtnameserv_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. grmic_SOURCES = grmic_LDFLAGS = --main=gnu.classpath.tools.rmic.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) grmic_LINK = $(GCJLINK) ## See jv_convert_LDADD. grmic_LDADD = -L$(here)/.libs libgcj-tools.la @@ -790,19 +1016,39 @@ grmic_DEPENDENCIES = libgcj-tools.la ## This is a dummy definition. grmiregistry_SOURCES = grmiregistry_LDFLAGS = --main=gnu.classpath.tools.rmiregistry.Main \ - -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) grmiregistry_LINK = $(GCJLINK) ## See jv_convert_LDADD. grmiregistry_LDADD = -L$(here)/.libs libgcj-tools.la grmiregistry_DEPENDENCIES = libgcj-tools.la +## This is a dummy definition. +gjdoc_SOURCES = +gjdoc_LDFLAGS = --main=gnu.classpath.tools.gjdoc.Main \ + -Djava.class.path=$(ANTLR_JAR) \ + -rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS) $(extra_ldflags) +gjdoc_LINK = $(GCJLINK) +## See jv_convert_LDADD. +gjdoc_LDADD = -L$(here)/.libs libgcj-tools.la +gjdoc_DEPENDENCIES = libgcj-tools.la + ## ################################################################ +if INTERPRETER +nat_jdwp_source_files = \ +gnu/classpath/jdwp/natVMFrame.cc \ +gnu/classpath/jdwp/natVMMethod.cc \ +gnu/classpath/jdwp/natVMVirtualMachine.cc +nat_jvmti_source_files = \ +gnu/gcj/jvmti/natBreakpoint.cc \ +gnu/gcj/jvmti/natNormalBreakpoint.cc +else +nat_jdwp_source_files = +nat_jvmti_source_files = +endif ## This lists all the C++ source files in subdirectories. nat_source_files = \ -gnu/classpath/jdwp/natVMFrame.cc \ -gnu/classpath/jdwp/natVMMethod.cc \ -gnu/classpath/jdwp/natVMVirtualMachine.cc \ +$(nat_jdwp_source_files) \ gnu/classpath/natConfiguration.cc \ gnu/classpath/natSystemProperties.cc \ gnu/classpath/natVMStackWalker.cc \ @@ -817,12 +1063,13 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \ gnu/gcj/convert/natOutput_SJIS.cc \ gnu/gcj/io/natSimpleSHSStream.cc \ gnu/gcj/io/shs.cc \ -gnu/gcj/jvmti/natBreakpoint.cc \ +$(nat_jvmti_source_files) \ gnu/gcj/runtime/natFinalizerThread.cc \ gnu/gcj/runtime/natSharedLibLoader.cc \ gnu/gcj/runtime/natSystemClassLoader.cc \ gnu/gcj/runtime/natStringBuffer.cc \ gnu/gcj/util/natDebug.cc \ +gnu/gcj/util/natGCInfo.cc \ gnu/java/lang/natMainThread.cc \ gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc \ gnu/java/lang/management/natVMCompilationMXBeanImpl.cc \ @@ -830,6 +1077,7 @@ gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc \ gnu/java/lang/management/natVMMemoryMXBeanImpl.cc \ gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc \ gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc \ +gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc \ gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc \ gnu/java/lang/management/natVMThreadMXBeanImpl.cc \ gnu/java/net/natPlainDatagramSocketImpl.cc \ @@ -840,10 +1088,10 @@ gnu/java/nio/natVMSelector.cc \ gnu/java/nio/natNIOServerSocket.cc \ gnu/java/nio/natVMChannel.cc \ gnu/java/nio/channels/natFileChannelImpl.cc \ +gnu/java/security/jce/prng/natVMSecureRandom.cc \ java/io/natFile.cc \ java/io/natVMObjectInputStream.cc \ java/io/natVMObjectStreamClass.cc \ -java/lang/management/natVMManagementFactory.cc \ java/lang/natCharacter.cc \ java/lang/natClass.cc \ java/lang/natClassLoader.cc \ @@ -854,12 +1102,12 @@ java/lang/natMath.cc \ java/lang/natObject.cc \ java/lang/natRuntime.cc \ java/lang/natString.cc \ -java/lang/natStringBuffer.cc \ -java/lang/natStringBuilder.cc \ +java/lang/natAbstractStringBuffer.cc \ java/lang/natSystem.cc \ java/lang/natThread.cc \ java/lang/natThreadLocal.cc \ java/lang/natVMClassLoader.cc \ +java/lang/natVMProcess.cc \ java/lang/natVMThrowable.cc \ java/lang/ref/natReference.cc \ java/lang/reflect/natArray.cc \ @@ -1048,8 +1296,10 @@ AM_MAKEFLAGS = \ "SHELL=$(SHELL)" \ "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ "exec_prefix=$(exec_prefix)" \ + "datadir=$(datadir)" \ "infodir=$(infodir)" \ "libdir=$(libdir)" \ + "mandir=$(mandir)" \ "prefix=$(prefix)" \ "gxx_include_dir=$(gxx_include_dir)" \ "AR=$(AR)" \ @@ -1069,9 +1319,10 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host MAKEOVERRIDES= -# No install-html support yet. -.PHONY: install-html +# No install-html or install-pdf support in automake yet +.PHONY: install-html install-pdf install-html: +install-pdf: # Multilib support variables. MULTISRCTOP =