Commit ba1304a3 by Thomas Fitzsimmons Committed by Thomas Fitzsimmons

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
parent d02f34e7
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> 2006-06-13 Thomas Fitzsimmons <fitzsim@redhat.com>
* configure: Regenerate. * configure: Regenerate.
......
...@@ -51,6 +51,7 @@ gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER) ...@@ -51,6 +51,7 @@ gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
gappletviewer_SOURCES = toolwrapper.c gappletviewer_SOURCES = toolwrapper.c
gappletviewer_CFLAGS = -Wall \ gappletviewer_CFLAGS = -Wall \
-I$(top_srcdir)/include \
-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
-DTOOLPACKAGE="\"appletviewer\"" \ -DTOOLPACKAGE="\"appletviewer\"" \
-DTOOLNAME="\"gappletviewer\"" -DTOOLNAME="\"gappletviewer\""
...@@ -58,6 +59,7 @@ gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM) ...@@ -58,6 +59,7 @@ gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
gjarsigner_SOURCES = toolwrapper.c gjarsigner_SOURCES = toolwrapper.c
gjarsigner_CFLAGS = -Wall \ gjarsigner_CFLAGS = -Wall \
-I$(top_srcdir)/include \
-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
-DTOOLPACKAGE="\"jarsigner\"" \ -DTOOLPACKAGE="\"jarsigner\"" \
-DTOOLNAME="\"gjarsigner\"" -DTOOLNAME="\"gjarsigner\""
...@@ -65,6 +67,7 @@ gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM) ...@@ -65,6 +67,7 @@ gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
gkeytool_SOURCES = toolwrapper.c gkeytool_SOURCES = toolwrapper.c
gkeytool_CFLAGS = -Wall \ gkeytool_CFLAGS = -Wall \
-I$(top_srcdir)/include \
-DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
-DTOOLPACKAGE="\"keytool\"" \ -DTOOLPACKAGE="\"keytool\"" \
-DTOOLNAME="\"gkeytool\"" -DTOOLNAME="\"gkeytool\""
......
...@@ -343,6 +343,7 @@ GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' ...@@ -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@gcc_version := $(shell cat $(top_srcdir)/../../gcc/BASE-VER)
@CREATE_WRAPPERS_TRUE@gappletviewer_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gappletviewer_SOURCES = toolwrapper.c
@CREATE_WRAPPERS_TRUE@gappletviewer_CFLAGS = -Wall \ @CREATE_WRAPPERS_TRUE@gappletviewer_CFLAGS = -Wall \
@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \
@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"appletviewer\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"appletviewer\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gappletviewer\"" @CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gappletviewer\""
...@@ -350,6 +351,7 @@ GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' ...@@ -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@gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
@CREATE_WRAPPERS_TRUE@gjarsigner_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gjarsigner_SOURCES = toolwrapper.c
@CREATE_WRAPPERS_TRUE@gjarsigner_CFLAGS = -Wall \ @CREATE_WRAPPERS_TRUE@gjarsigner_CFLAGS = -Wall \
@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \
@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"jarsigner\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"jarsigner\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gjarsigner\"" @CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gjarsigner\""
...@@ -357,6 +359,7 @@ GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip' ...@@ -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@gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
@CREATE_WRAPPERS_TRUE@gkeytool_SOURCES = toolwrapper.c @CREATE_WRAPPERS_TRUE@gkeytool_SOURCES = toolwrapper.c
@CREATE_WRAPPERS_TRUE@gkeytool_CFLAGS = -Wall \ @CREATE_WRAPPERS_TRUE@gkeytool_CFLAGS = -Wall \
@CREATE_WRAPPERS_TRUE@ -I$(top_srcdir)/include \
@CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"keytool\"" \ @CREATE_WRAPPERS_TRUE@ -DTOOLPACKAGE="\"keytool\"" \
@CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gkeytool\"" @CREATE_WRAPPERS_TRUE@ -DTOOLNAME="\"gkeytool\""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment