1 --- libjava/Makefile.in Tue May 13 17:18:14 2003
2 +++ libjava/Makefile.in Fri Jul 4 02:38:46 2003
4 @XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++
5 @XLIB_AWT_FALSE@xlib_includes =
7 -toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la $(cond_x_ltlibrary)
8 +toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
9 +#lib-org-xml-sax.la lib-org-w3c-dom.la
10 toolexecmainlib_DATA = libgcj.spec
12 jardir = $(datadir)/java
15 secdir = $(libdir)/security
17 -@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
18 +@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij
21 bin_SCRIPTS = addr2name.awk
22 @CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar
24 all_java_source_files = \
25 $(java_source_files) \
26 $(built_java_source_files) \
27 - $(lib_org_xml_sax_la_SOURCES) \
28 - $(lib_org_w3c_dom_la_SOURCES) \
29 - $(x_java_source_files)
30 +# $(lib_org_xml_sax_la_SOURCES) \
31 +# $(lib_org_w3c_dom_la_SOURCES) \
32 +# $(x_java_source_files)
35 all_java_class_files = $(all_java_source_files:.java=.class)
36 @@ -2060,10 +2062,11 @@
37 java/util/zip/ZipFile.java \
38 java/util/zip/ZipInputStream.java \
39 java/util/zip/ZipOutputStream.java \
40 -$(rmi_java_source_files) \
41 -$(awt_java_source_files) \
42 -$(convert_source_files) \
43 -$(javax_source_files)
44 +java/awt/AWTPermission.java \
45 +$(convert_source_files)
46 +#$(rmi_java_source_files) \
47 +#$(awt_java_source_files) \
48 +#$(javax_source_files)
51 java_source_files = $(special_java_source_files) $(ordinary_java_source_files)
53 gnu/gcj/xlib/natXExposeEvent.lo gnu/gcj/xlib/natXImage.lo \
54 gnu/gcj/xlib/natXUnmapEvent.lo
55 @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
56 -@NATIVE_TRUE@rmic$(EXEEXT) rmiregistry$(EXEEXT)
57 +#@NATIVE_TRUE@rmic$(EXEEXT) rmiregistry$(EXEEXT)
58 @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
59 @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS$(EXEEXT)
60 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
61 @@ -3827,8 +3830,10 @@
62 .deps/org/xml/sax/helpers/XMLReaderFactory.P .deps/posix-threads.P \
63 .deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P \
64 .deps/win32-threads.P .deps/win32.P
65 -SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES)
66 -OBJECTS = $(libgcj_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS)
67 +SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCE)
68 +#$(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(lib_gnu_awt_xlib_la_SOURCES) $(EXTRA_lib_gnu_awt_xlib_la_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES)
69 +OBJECTS = $(libgcj_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(gen_from_JIS_OBJECTS)
70 +#$(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_gnu_awt_xlib_la_OBJECTS) $(rmiregistry_OBJECTS)
76 $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
78 -$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java
79 +#$(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS)
80 +$(javao_files) $(x_javao_files): %.lo: %.java
81 $(GCJCOMPILE) -o $@ $<
83 libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)