diff options
| author | Anthony Green <green@cygnus.com> | 2000-09-03 21:09:10 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 2000-09-03 21:09:10 +0000 |
| commit | 3c809ba45bfc40851f7a2484c42394e370a31cbc (patch) | |
| tree | bc19723d1ec8b5074d952165b17b5a0dc5c1761e /gcc/java | |
| parent | e093c992b8cfa82a15bc7cc678aa38c779c4bd9b (diff) | |
| download | gcc-3c809ba45bfc40851f7a2484c42394e370a31cbc.zip gcc-3c809ba45bfc40851f7a2484c42394e370a31cbc.tar.gz gcc-3c809ba45bfc40851f7a2484c42394e370a31cbc.tar.bz2 | |
Configure changes required for zlib.
From-SVN: r36122
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in index 2ddebb9..7b28bc1 100644 --- a/gcc/java/Makefile.in +++ b/gcc/java/Makefile.in @@ -148,16 +148,20 @@ ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) # This is where we get libiberty.a from. LIBIBERTY = ../../libiberty/libiberty.a +# This is where we get zlib from. zlibdir is -L../../zlib by default, +# and is nothing when configured with --enable-system-zlib. +ZLIB = @zlibdir@ -lz + # How to link with both our special library facilities # and the system's installed libraries. -LIBS = $(INTLLIBS) $(LIBIBERTY) $(CLIB) +LIBS = $(ZLIB) $(INTLLIBS) $(LIBIBERTY) $(CLIB) LIBDEPS = $(INTLLIBS) $(LIBIBERTY) ../errors.o # Specify the directories to be searched for header files. # Both . and srcdir are used, in that order, # so that tm.h and config.h will be found in the compilation # subdirectory rather than in the source directory. -INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config -I$(srcdir)/../../include +INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config -I$(srcdir)/../../include @zlibinc@ # Always use -I$(srcdir)/config when compiling. .c.o: |