diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-08-26 22:33:03 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-08-26 22:33:03 +0000 |
| commit | 18b3501e639925e4de72b6b7be07c4c667e74090 (patch) | |
| tree | 5a814dcddbef588c8e151facee34ecebebf46bdc | |
| parent | 00229de405d3ddbe05a4229a4758b67aee1b88b6 (diff) | |
| download | gcc-18b3501e639925e4de72b6b7be07c4c667e74090.zip gcc-18b3501e639925e4de72b6b7be07c4c667e74090.tar.gz gcc-18b3501e639925e4de72b6b7be07c4c667e74090.tar.bz2 | |
Makefile.in: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am: Removed all GNU-make-specific FIXME comments.
From-SVN: r70824
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/Makefile.am | 17 |
2 files changed, 9 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 2520e70..8008789 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,8 @@ 2003-08-26 Tom Tromey <tromey@redhat.com> + * Makefile.in: Rebuilt. + * Makefile.am: Removed all GNU-make-specific FIXME comments. + * java/lang/ref/Reference.java (get): Indentation fix. (clear): Comment fix. (enqueue): Likewise. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 8dfc5ab..e6a06d1 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -233,11 +233,9 @@ gnu/java/awt/peer/gtk/GtkTextFieldPeer.java \ gnu/java/awt/peer/gtk/GtkToolkit.java \ gnu/java/awt/peer/gtk/GtkWindowPeer.java -## FIXME: GNU make. gtk_c_headers = $(patsubst %.java,jniinclude/%.h,$(subst /,_,$(gtk_awt_peer_sources))) $(gtk_c_headers): $(gtk_awt_peer_sources) -## FIXME: GNU make. @input=`echo $@ | sed -e 's,jniinclude/,,' -e 's,_,.,g' -e 's,.h$$,,'`; \ echo "$(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input"; \ $(GCJH) -jni -d jniinclude -classpath '' -bootclasspath $(top_builddir) $$input @@ -362,28 +360,27 @@ SUFFIXES = .class .java .h .java.lo: $(GCJCOMPILE) -o $@ $< -## This is GNU make specific. For the .o files in subdirs, use a -## special rule. The standard automake rule can't be overridden (this -## is a bug in automake), and it also won't put the .o files into -## subdirs. FIXME. +## FIXME: For the .o files in subdirs, use a special rule. The +## standard automake rule can't be overridden (this is a bug in +## automake), and it also won't put the .o files into subdirs. $(nat_files) $(x_nat_files): %.lo: %.cc @echo '$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<'; \ $(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $< @-mv $(@:.lo=.pp) $(@:.lo=.d) -## FIXME: GNU make. +## FIXME: see above $(c_files): %.lo: %.c $(LTCOMPILE) -c -o $@ $< $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h -## FIXME: GNU make. +## FIXME: see above $(gtk_c_files): %.lo: %.c $(LTCOMPILE) -c -Ijniinclude -I$(srcdir)/jni/classpath -I$(srcdir)/jni/gtk-peer $(GTK_CFLAGS) $(LIBART_CFLAGS) -o $@ $< $(gtk_c_files): $(gtk_c_headers) -## FIXME: GNU make. +## FIXME: see above. $(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< @@ -410,7 +407,6 @@ lib-gnu-awt-xlib.la: $(lib_gnu_awt_xlib_la_OBJECTS) $(lib_gnu_awt_xlib_la_DEPEND ## .class.h: -## FIXME: GNU make specific. $(GCJH) -classpath '' -bootclasspath $(top_builddir) $(basename $<) ## Header files used when compiling some of the nat* files. @@ -2721,7 +2717,6 @@ texinfo: TexinfoDoclet.class ## Dependency tracking madness. ## -## FIXME: depends on GNU make. -include deps.mk ## This is an evil hack to work around an automake limitation. We |