Commit 480222b5 by Tom Tromey Committed by Tom Tromey

Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am: Include deps.mk.
	(GCJCOMPILE): Added -MD, -MT, and -MF.
	($(javao_files)): Don't depend on libgcj.zip.
	(all-recursive): New target.
	(%.lo:%.cc): Do dependency tracking.
	($(nat_headers)): Don't depend on libgcj.zip.
	* configure: Rebuilt.
	* configure.in: Make .d files and deps.mk.

From-SVN: r36982
parent 316a06a1
2000-10-20 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt.
* Makefile.am: Include deps.mk.
(GCJCOMPILE): Added -MD, -MT, and -MF.
($(javao_files)): Don't depend on libgcj.zip.
(all-recursive): New target.
(%.lo:%.cc): Do dependency tracking.
($(nat_headers)): Don't depend on libgcj.zip.
* configure: Rebuilt.
* configure.in: Make .d files and deps.mk.
2000-10-13 Bryce McKinlay <bryce@albatross.co.nz> 2000-10-13 Bryce McKinlay <bryce@albatross.co.nz>
* exception.cc: Don't #include "exception". * exception.cc: Don't #include "exception".
......
...@@ -65,7 +65,7 @@ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT) ...@@ -65,7 +65,7 @@ GCJH = $(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT) ZIP = $(MULTIBUILDTOP)../$(COMPPATH)/zip/zip$(EXEEXT)
endif # CANADIAN endif # CANADIAN
GCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -c GCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ) -fassume-compiled -fclasspath=$(here) -L$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@ LIBLINK = $(LIBTOOL) --mode=link $(CC) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
...@@ -117,12 +117,13 @@ javao_files = $(java_source_files:.java=.lo) \ ...@@ -117,12 +117,13 @@ javao_files = $(java_source_files:.java=.lo) \
libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'` libffi_files = `$(AR) t ../libffi/.libs/libffi.a 2>/dev/null | sed 's/\.o/\.lo/g' | sed 's/^/..\/libffi\//g'`
libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \ libgcj_la_SOURCES = prims.cc posix.cc jni.cc exception.cc \
resolve.cc defineclass.cc interpret.cc name-finder.cc resolve.cc defineclass.cc interpret.cc name-finder.cc \
$(nat_source_files)
EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \
$(c_source_files) $(java_source_files) $(built_java_source_files) $(c_source_files) $(java_source_files) $(built_java_source_files)
libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) \
$(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL) $(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \ libgcj_la_LIBADD = $(javao_files) $(c_files) $(GCOBJS) \
$(THREADOBJS) $(libffi_files) $(LIBLTDL) $(THREADOBJS) $(libffi_files) $(LIBLTDL)
libgcj_la_LDFLAGS = -lsupc++ -rpath $(toolexeclibdir) \ libgcj_la_LDFLAGS = -lsupc++ -rpath $(toolexeclibdir) \
## The mysterious backslash is consumed by make. ## The mysterious backslash is consumed by make.
...@@ -192,10 +193,14 @@ SUFFIXES = .class .java .h ...@@ -192,10 +193,14 @@ SUFFIXES = .class .java .h
## is a bug in automake), and it also won't put the .o files into ## is a bug in automake), and it also won't put the .o files into
## subdirs. FIXME. ## subdirs. FIXME.
$(nat_files): %.lo: %.cc $(nat_files): %.lo: %.cc
$(LTCXXCOMPILE) -c -o $@ $< @echo '$(LTCXXCOMPILE) -c -o $@ $<'; \
$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c -o $@ $<
$(nat_files) $(GCOBJS) $(THREADOBJS) $(libgcj_la_OBJECTS) $(gij_OBJECTS): \ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
include/config.h include/java-signal.h $(nat_headers) < .deps/$(*F).pp > .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm -f .deps/$(*F).pp
## FIXME: GNU make. ## FIXME: GNU make.
$(c_files): %.lo: %.c $(c_files): %.lo: %.c
...@@ -207,8 +212,6 @@ $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h ...@@ -207,8 +212,6 @@ $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
$(javao_files): %.lo: %.java $(javao_files): %.lo: %.java
$(GCJCOMPILE) -o $@ $< $(GCJCOMPILE) -o $@ $<
$(javao_files): libgcj.zip
## ################################################################ ## ################################################################
## ##
...@@ -225,8 +228,6 @@ nat_headers = $(ordinary_java_source_files:.java=.h) \ ...@@ -225,8 +228,6 @@ nat_headers = $(ordinary_java_source_files:.java=.h) \
java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectOutputStream$$PutField.h \
java/io/ObjectInputStream$$GetField.h java/io/ObjectInputStream$$GetField.h
$(nat_headers): libgcj.zip
java/lang/ClassLoader.h: java/lang/ClassLoader.class libgcj.zip java/lang/ClassLoader.h: java/lang/ClassLoader.class libgcj.zip
$(GCJH) -classpath $(top_builddir) \ $(GCJH) -classpath $(top_builddir) \
-friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \ -friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
...@@ -1170,6 +1171,22 @@ java/util/zip/natInflater.cc ...@@ -1170,6 +1171,22 @@ java/util/zip/natInflater.cc
## ################################################################ ## ################################################################
## ##
## Dependency tracking madness.
##
## FIXME: depends on GNU make.
-include deps.mk
## This is an evil hack to work around an automake limitation. We
## need to ensure that the built headers are built before we try to
## compile the C++ sources, but we can't make the .o files depend on
## the headers, because in that case we'll force a complete rebuild of
## the C++ code whenever any .java file is touched.
all-recursive: $(nat_headers)
## ################################################################
##
## This section is for make and multilib madness. ## This section is for make and multilib madness.
## ##
......
...@@ -5848,6 +5848,7 @@ fi ...@@ -5848,6 +5848,7 @@ fi
here=`pwd` here=`pwd`
trap '' 1 2 15 trap '' 1 2 15
cat > confcache <<\EOF cat > confcache <<\EOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure
...@@ -6347,6 +6348,26 @@ test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h ...@@ -6347,6 +6348,26 @@ test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h
if test -n "$CONFIG_FILES"; then if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
fi fi
# Make subdirectories and `.d' files. Look in both srcdir and
# builddir for the .java files.
h=`pwd`
: > deps.mk
( (cd $srcdir && find . -name '*.java' -print) ;
find . -name '*.java' -print) | \
fgrep -v testsuite | \
sed -e 's/\.java/.d/' | \
while read f; do
echo "include $f" >> deps.mk
test -f $f || {
d=`echo $f | sed -e 's,/[^/]*$,,'`
$srcdir/../mkinstalldirs $d
: > $f
}
done
exit 0 exit 0
EOF EOF
chmod +x $CONFIG_STATUS chmod +x $CONFIG_STATUS
......
...@@ -765,10 +765,31 @@ fi ...@@ -765,10 +765,31 @@ fi
here=`pwd` here=`pwd`
AC_SUBST(here) AC_SUBST(here)
AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile, AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile,
[if test -n "$CONFIG_FILES"; then [if test -n "$CONFIG_FILES"; then
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
fi], fi
# Make subdirectories and `.d' files. Look in both srcdir and
# builddir for the .java files.
h=`pwd`
: > deps.mk
( (cd $srcdir && find . -name '*.java' -print) ;
find . -name '*.java' -print) | \
fgrep -v testsuite | \
sed -e 's/\.java/.d/' | \
while read f; do
echo "include $f" >> deps.mk
test -f $f || {
changequote(<<,>>)
d=`echo $f | sed -e 's,/[^/]*$,,'`
changequote([,])
$srcdir/../mkinstalldirs $d
: > $f
}
done
],
srcdir=${srcdir} srcdir=${srcdir}
host=${host} host=${host}
target=${target} target=${target}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment