From 2af84af57ba04e022a258d99fb7b688017e583a7 Mon Sep 17 00:00:00 2001 From: Scott Gilbertson Date: Wed, 15 Jan 2003 23:34:14 +0000 Subject: [PATCH] Makefile.in: Rebuilt. 2003-01-15 Scott Gilbertson * Makefile.in: Rebuilt. * Makefile.am (xlib_includes): New macro. (INCLUDES): Use it. From-SVN: r61366 --- libjava/ChangeLog | 6 ++++++ libjava/Makefile.am | 6 ++++-- libjava/Makefile.in | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9f1d5304c80..081ce99c6b7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-01-15 Scott Gilbertson + + * Makefile.in: Rebuilt. + * Makefile.am (xlib_includes): New macro. + (INCLUDES): Use it. + 2003-01-15 Scott Gilbertson * gnu/awt/xlib/XToolkit.java (getColorModel): Implemented. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index e9f52f94cd7..afdb8253ae0 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -25,8 +25,11 @@ endif if XLIB_AWT cond_x_ltlibrary = libgcjx.la +## We require libstdc++-v3 to be in the same build tree. +xlib_includes = -I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ else cond_x_ltlibrary = +xlib_includes = endif toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la $(cond_x_ltlibrary) @@ -107,10 +110,9 @@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) LIBFFIINCS = @LIBFFIINCS@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ - $(GCINCS) $(THREADINCS) $(INCLTDL) \ + $(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) - ## ################################################################ ## diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 595c24fbfe7..e771b4e5cb4 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -136,6 +136,8 @@ AUTOMAKE_OPTIONS = foreign @USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) @XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la @XLIB_AWT_FALSE@cond_x_ltlibrary = +@XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ +@XLIB_AWT_FALSE@xlib_includes = toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la $(cond_x_ltlibrary) toolexeclib_DATA = libgcj.spec @@ -182,7 +184,7 @@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) LIBFFIINCS = @LIBFFIINCS@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ - $(GCINCS) $(THREADINCS) $(INCLTDL) \ + $(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) -- 2.30.2