Makefile.in: Rebuilt.

2003-01-15  Scott Gilbertson  <scottg@mantatest.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (xlib_includes): New macro.
	(INCLUDES): Use it.

From-SVN: r61366

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9f1d5304c80cd19c84b1bd6fa0b96c67d9612919..081ce99c6b7f747ef9dedf09e1aa1116f64649e9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-15  Scott Gilbertson  <scottg@mantatest.com>
+
+       * Makefile.in: Rebuilt.
+       * Makefile.am (xlib_includes): New macro.
+       (INCLUDES): Use it.
+
 2003-01-15  Scott Gilbertson  <scottg@mantatest.com>
 
        * gnu/awt/xlib/XToolkit.java (getColorModel): Implemented.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index e9f52f94cd7eb00f72bef65c74d195b39e0b59eb..afdb8253ae0cc7cbcf1f2c685e51894b49b7823f 100644 (file)
--- 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 595c24fbfe7daa25cf48a389d2a3cc5bcccb2e73..e771b4e5cb43e28e1db949509eb42da080c83898 100644 (file)
--- 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)