diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-14 13:48:08 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-06-14 13:48:08 +0000 |
| commit | 91b969354d5c70d7273bd7159cace76362a7b8e3 (patch) | |
| tree | 64e2af1d70c2a3bdf2e81f06084284ee2133139c /libjava | |
| parent | 9181f7d7bb328f48df113570b0084ae787ec2950 (diff) | |
| download | gcc-91b969354d5c70d7273bd7159cace76362a7b8e3.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114638 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 85477b7df2c..46999d7ffc5 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 87ee030cd03..ced1811d51d 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 6a356374449..1674ffa3319 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\"" |