diff options
Diffstat (limited to 'libjava/classpath/lib/Makefile.in')
| -rw-r--r-- | libjava/classpath/lib/Makefile.in | 75 |
1 files changed, 44 insertions, 31 deletions
diff --git a/libjava/classpath/lib/Makefile.in b/libjava/classpath/lib/Makefile.in index bcc76110a6a..759cead840b 100644 --- a/libjava/classpath/lib/Makefile.in +++ b/libjava/classpath/lib/Makefile.in @@ -44,12 +44,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ $(top_srcdir)/../../config/lead-dot.m4 \ + $(top_srcdir)/../../config/no-executables.m4 \ $(top_srcdir)/../../libtool.m4 $(top_srcdir)/m4/acattribute.m4 \ $(top_srcdir)/m4/accross.m4 $(top_srcdir)/m4/acinclude.m4 \ $(top_srcdir)/m4/ax_create_stdint_h.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/gcc_attribute.m4 $(top_srcdir)/m4/iconv.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -162,6 +164,8 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION = @JAVA_LANG_SYSTEM_EXPLICIT_INITIALIZATION@ +JAVA_MAINTAINER_MODE_FALSE = @JAVA_MAINTAINER_MODE_FALSE@ +JAVA_MAINTAINER_MODE_TRUE = @JAVA_MAINTAINER_MODE_TRUE@ JAY = @JAY@ JAY_SKELETON = @JAY_SKELETON@ JIKES = @JIKES@ @@ -283,24 +287,24 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -toolexeclibdir = @toolexeclibdir@ vm_classes = @vm_classes@ JAVA_DEPEND = java.dep -propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org META-INF -type d ! -name CVS -print | fgrep -v .svn) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) +cssfiles := $(shell cd $(top_srcdir) && $(FIND) gnu java javax org -name \*\.css -print) metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print | fgrep -v .svn) 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:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER) +compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER) @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 @FOUND_GCJ_FALSE@@FOUND_JIKES_TRUE@JAVAC = $(JIKES) $(JIKESWARNINGS) +F $(JIKESENCODING) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(compile_classpath) -d . @classes # handling source to bytecode compiler programs like gcj, jikes and kjc -@FOUND_GCJ_TRUE@JAVAC = exit 1 +@FOUND_GCJ_TRUE@JAVAC = $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath '' --classpath $(compile_classpath) -d $(srcdir) @classes JAVAH = $(USER_JAVAH) -jni -classpath .:$(USER_CLASSLIB) @CREATE_COLLECTIONS_TRUE@COLLECTIONS = collections.jar @BUILD_CLASS_FILES_TRUE@noinst_DATA = genclasses compile-classes resources +# endif EXTRA_DIST = standard.omit.in mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ glibj.zip classes.1 classes.2 Makefile.deps \ @@ -487,8 +491,7 @@ 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 '*.java' -type f -print` -@CREATE_COLLECTIONS_TRUE@@FOUND_GCJ_FALSE@ $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print` +@CREATE_COLLECTIONS_TRUE@ $(JAVAC) `$(FIND) $(COLLECTIONS_PREFIX) -name '*.java' -type f -print` @CREATE_COLLECTIONS_TRUE@ if test "$(FASTJAR)" != ""; then \ @CREATE_COLLECTIONS_TRUE@ $(FASTJAR) cf $@ $(COLLECTIONS_PREFIX); \ @CREATE_COLLECTIONS_TRUE@ else \ @@ -523,22 +526,26 @@ sinclude $(JAVA_DEPEND) @USE_PREBUILT_GLIBJ_ZIP_FALSE@ if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax org sun META-INF; fi resources: copy-vmresources.sh - if ! [ -e gnu ]; then mkdir gnu; fi - if ! [ -e gnu/java ]; then mkdir gnu/java; fi - if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi - if ! [ -e gnu/javax/swing/plaf/gtk/icons ]; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi - list='$(propertydirs)'; for p in $$list; do \ - if ! [ -e $$p ]; then mkdir $$p; fi; \ + @list='$(propertyfiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/resource/$$p $$p; \ done - list='$(propertyfiles)'; for p in $$list; do \ - cp -f $(top_srcdir)/resource/$$p $$p; \ + @list='$(cssfiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/$$p $$p; \ done - list='$(metafiles)'; for p in $$list; do \ - cp -f $(top_srcdir)/resource/$$p $$p; \ + @list='$(metafiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/resource/$$p $$p; \ done - $(SHELL) ./copy-vmresources.sh - list='$(iconfiles)'; for p in $$list; do \ - cp -f $(top_srcdir)/$$p $$p; \ + @$(SHELL) ./copy-vmresources.sh + @list='$(iconfiles)'; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/$$p $$p; \ done touch resources @@ -564,15 +571,21 @@ genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/Local $(JAVA_DEPEND): genclasses -@FOUND_GCJ_TRUE@compile-classes: classes $(JAVA_SRCS) Makefile -@FOUND_GCJ_TRUE@ $(MAKE) -f $(srcdir)/Makefile.gcj \ -@FOUND_GCJ_TRUE@ GCJ='$(GCJ)' \ -@FOUND_GCJ_TRUE@ compile_classpath='$(top_builddir):$(compile_classpath)' \ -@FOUND_GCJ_TRUE@ top_srcdir=$(top_srcdir) -@FOUND_GCJ_TRUE@ touch compile-classes -@FOUND_GCJ_FALSE@compile-classes: classes $(JAVA_SRCS) Makefile -@FOUND_GCJ_FALSE@ $(JAVAC) -@FOUND_GCJ_FALSE@ touch compile-classes +# if FOUND_GCJ +# ## When building with gcj, we do a recursive make. We split this rule +# ## out specially, rather than simply defining JAVAC, so that GNU make +# ## will see the recursive make invocation and still allow parallel +# ## builds. +# compile-classes: classes $(JAVA_SRCS) Makefile +# $(MAKE) -f $(srcdir)/Makefile.gcj \ +# GCJ='$(GCJ)' \ +# compile_classpath='$(top_builddir):$(compile_classpath)' \ +# top_srcdir=$(top_srcdir) +# touch compile-classes +# else +compile-classes: classes $(JAVA_SRCS) Makefile +@JAVA_MAINTAINER_MODE_TRUE@ $(JAVAC) + touch compile-classes clean-local: -rm -rf gnu |
