diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2006-06-14 13:48:08 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2006-06-14 13:48:08 +0000 |
| commit | ba1304a3dce495313b7c6a201fded9d0acd8e560 (patch) | |
| tree | 64e2af1d70c2a3bdf2e81f06084284ee2133139c | |
| parent | d02f34e7df05181cad0bb8057ce3c5d8d5c307c8 (diff) | |
| download | gcc-ba1304a3dce495313b7c6a201fded9d0acd8e560.zip gcc-ba1304a3dce495313b7c6a201fded9d0acd8e560.tar.gz gcc-ba1304a3dce495313b7c6a201fded9d0acd8e560.tar.bz2 | |
Makefile.am (gappletviewer_CFLAGS): Add -I$(top_srcdir)/include.
2006-06-14 Thomas Fitzsimmons <fitzsim@redhat.com>
* classpath/tools/Makefile.am (gappletviewer_CFLAGS): Add
-I$(top_srcdir)/include.
(gjarsigner_CFLAGS): Likewise.
(gkeytool_CFLAGS): Likewise.
* classpath/tools/Makefile.in: Regenerate.
From-SVN: r114638
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 3 | ||||
| -rw-r--r-- | libjava/classpath/tools/Makefile.in | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 85477b7..46999d7 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2006-06-14 Thomas Fitzsimmons <fitzsim@redhat.com> + + * classpath/tools/Makefile.am (gappletviewer_CFLAGS): Add + -I$(top_srcdir)/include. + (gjarsigner_CFLAGS): Likewise. + (gkeytool_CFLAGS): Likewise. + * classpath/tools/Makefile.in: Regenerate. + 2006-06-13 Thomas Fitzsimmons <fitzsim@redhat.com> * configure: Regenerate. diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 87ee030..ced1811 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -51,6 +51,7 @@ gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) gappletviewer_SOURCES = toolwrapper.c gappletviewer_CFLAGS = -Wall \ + -I$(top_srcdir)/include \ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -DTOOLPACKAGE="\"appletviewer\"" \ -DTOOLNAME="\"gappletviewer\"" @@ -58,6 +59,7 @@ gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) gjarsigner_SOURCES = toolwrapper.c gjarsigner_CFLAGS = -Wall \ + -I$(top_srcdir)/include \ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -DTOOLPACKAGE="\"jarsigner\"" \ -DTOOLNAME="\"gjarsigner\"" @@ -65,6 +67,7 @@ gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) gkeytool_SOURCES = toolwrapper.c gkeytool_CFLAGS = -Wall \ + -I$(top_srcdir)/include \ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -DTOOLPACKAGE="\"keytool\"" \ -DTOOLNAME="\"gkeytool\"" diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 6a35637..1674ffa 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -343,6 +343,7 @@ GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' @CREATE_WRAPPERS_TRUE@gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) @CREATE_WRAPPERS_TRUE@gappletviewer_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gappletviewer_CFLAGS = -Wall \ +@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ @CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"appletviewer\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gappletviewer\"" @@ -350,6 +351,7 @@ GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' @CREATE_WRAPPERS_TRUE@gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) @CREATE_WRAPPERS_TRUE@gjarsigner_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gjarsigner_CFLAGS = -Wall \ +@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ @CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"jarsigner\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gjarsigner\"" @@ -357,6 +359,7 @@ GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' @CREATE_WRAPPERS_TRUE@gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) @CREATE_WRAPPERS_TRUE@gkeytool_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gkeytool_CFLAGS = -Wall \ +@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \ @CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"keytool\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gkeytool\"" |