Skip to content

R
riscv-gcc-1
Commit 27651ad3 by Thomas Fitzsimmons Committed by Thomas Fitzsimmons
Options

Makefile.am: Comment out tools wrapper creation. 

2006-06-30  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* classpath/tools/Makefile.am: Comment out tools wrapper creation.
	(TOOLS_ZIP): Rename tools.zip tools.jar.
	(noinst_DATA): Do not install tools.jar.
	* classpath/tools/Makefile.in: Regenerate.
	* classpath/Makefile.am (SUBDIRS): Add tools.
	(DIST_SUBDIRS): Likewise.
	* classpath/Makefile.in: Regenerate.
	* Makefile.am (toolexeclib_LTLIBRARIES): Add libgcj-tools.la.
	(jar_DATA): Add libgcj-tools-$(gcc_version).jar.
	(bin_PROGRAMS): Add gappletviewer, gjarsigner and gkeytool.
	Add build logic for libgcj-tools.la,
	libgcj-tools-$(gcc_version).jar and gappletviewer, gjarsigner and
	gkeytool.
	* Makefile.in: Regenerate.

From-SVN: r115097
parent 444762df
Showing with 128 additions and 65 deletions
libjava/ChangeLog
2006-06-30 Thomas Fitzsimmons <fitzsim@redhat.com>
* classpath/tools/Makefile.am: Comment out tools wrapper creation.
(TOOLS_ZIP): Rename tools.zip tools.jar.
(noinst_DATA): Do not install tools.jar.
* classpath/tools/Makefile.in: Regenerate.
* classpath/Makefile.am (SUBDIRS): Add tools.
(DIST_SUBDIRS): Likewise.
* classpath/Makefile.in: Regenerate.
* Makefile.am (toolexeclib_LTLIBRARIES): Add libgcj-tools.la.
(jar_DATA): Add libgcj-tools-$(gcc_version).jar.
(bin_PROGRAMS): Add gappletviewer, gjarsigner and gkeytool.
Add build logic for libgcj-tools.la,
libgcj-tools-$(gcc_version).jar and gappletviewer, gjarsigner and
gkeytool.
* Makefile.in: Regenerate.
2006-06-29 Ranjit Mathew <rmathew@gcc.gnu.org> 2006-06-29 Ranjit Mathew <rmathew@gcc.gnu.org>
* gcj/javaprims.h (_Jv_uintptr_t): New typedef similar to uintptr_t in * gcj/javaprims.h (_Jv_uintptr_t): New typedef similar to uintptr_t in
......
libjava/Makefile.am
...@@ -33,7 +33,7 @@ libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) ...@@ -33,7 +33,7 @@ libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
## What gets installed, and where. ## What gets installed, and where.
## ##
toolexeclib_LTLIBRARIES = libgcj.la libgij.la toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la
toolexecmainlib_DATA = libgcj.spec toolexecmainlib_DATA = libgcj.spec
if XLIB_AWT if XLIB_AWT
...@@ -46,7 +46,7 @@ pkgconfigdir = $(libdir)/pkgconfig ...@@ -46,7 +46,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgcj.pc pkgconfig_DATA = libgcj.pc
jardir = $(datadir)/java jardir = $(datadir)/java
jar_DATA = libgcj-$(gcc_version).jar jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
if JAVA_HOME_SET if JAVA_HOME_SET
JAVA_HOME_DIR = $(JAVA_HOME) JAVA_HOME_DIR = $(JAVA_HOME)
...@@ -68,7 +68,8 @@ db_pathtail = gcj-$(gcc_version)/$(db_name) ...@@ -68,7 +68,8 @@ db_pathtail = gcj-$(gcc_version)/$(db_name)
## For now, only on native systems. FIXME. ## For now, only on native systems. FIXME.
if NATIVE if NATIVE
bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \
gappletviewer gjarsigner gkeytool
## It is convenient to actually build and install the default database ## It is convenient to actually build and install the default database
## when gcj-dbtool is available. ## when gcj-dbtool is available.
...@@ -234,6 +235,12 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \ ...@@ -234,6 +235,12 @@ libgcj_la_DEPENDENCIES = libgcj-$(gcc_version).jar \
$(LIBLTDL) $(libgcj_la_LIBADD) $(LIBLTDL) $(libgcj_la_LIBADD)
libgcj_la_LINK = $(LIBLINK) libgcj_la_LINK = $(LIBLINK)
libgcj_tools_la_SOURCES = classpath/tools/tools.jar
libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch
libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_tools_la_LINK = $(LIBLINK)
## libjvm.so ## libjvm.so
libjvm_la_SOURCES = jni-libjvm.cc libjvm_la_SOURCES = jni-libjvm.cc
libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec libjvm_la_DEPENDENCIES = libgcj.la libgcj.spec
...@@ -282,7 +289,10 @@ libgcj-$(gcc_version).jar: classpath/lib/compile-classes ...@@ -282,7 +289,10 @@ libgcj-$(gcc_version).jar: classpath/lib/compile-classes
cd classpath/lib; $(JAR) -cfM \ cd classpath/lib; $(JAR) -cfM \
../../libgcj-$(gcc_version).jar gnu java javax org ../../libgcj-$(gcc_version).jar gnu java javax org
CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar: classpath/tools/tools.jar
cp $< $@
CLEANFILES = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
DISTCLEANFILES = native.dirs DISTCLEANFILES = native.dirs
mostlyclean-local: mostlyclean-local:
...@@ -721,6 +731,39 @@ grmiregistry_LDADD = -L$(here)/.libs libgcj.la ...@@ -721,6 +731,39 @@ grmiregistry_LDADD = -L$(here)/.libs libgcj.la
## linking this program. ## linking this program.
grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec grmiregistry_DEPENDENCIES = libgcj.la libgcj.spec
## This is a dummy definition.
gappletviewer_SOURCES =
gappletviewer_LDFLAGS = --main=gnu.classpath.tools.appletviewer.Main \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
gappletviewer_LINK = $(GCJLINK)
## See jv_convert_LDADD.
gappletviewer_LDADD = -L$(here)/.libs libgcj-tools.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
gappletviewer_DEPENDENCIES = libgcj-tools.la
## This is a dummy definition.
gjarsigner_SOURCES =
gjarsigner_LDFLAGS = --main=gnu.classpath.tools.jarsigner.Main \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
gjarsigner_LINK = $(GCJLINK)
## See jv_convert_LDADD.
gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
gjarsigner_DEPENDENCIES = libgcj-tools.la
## This is a dummy definition.
gkeytool_SOURCES =
gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
gkeytool_LINK = $(GCJLINK)
## See jv_convert_LDADD.
gkeytool_LDADD = -L$(here)/.libs libgcj-tools.la
## Depend on the spec file to make sure it is up to date before
## linking this program.
gkeytool_DEPENDENCIES = libgcj-tools.la
## ################################################################ ## ################################################################
## This lists all the C++ source files in subdirectories. ## This lists all the C++ source files in subdirectories.
......
libjava/classpath/Makefile.am
## Input file for automake to generate the Makefile.in used by configure ## Input file for automake to generate the Makefile.in used by configure
# lib first, to compile .class files before native code, last examples # lib first, to compile .class files before native code, last examples
## GCJ LOCAL: exclude tools directory SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR) DIST_SUBDIRS = lib doc external include native resource scripts tools examples
DIST_SUBDIRS = lib doc external include native resource scripts examples
## GCJ LOCAL: we need an extra -I here. ## GCJ LOCAL: we need an extra -I here.
ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config
......
libjava/classpath/Makefile.in
...@@ -295,8 +295,8 @@ target_vendor = @target_vendor@ ...@@ -295,8 +295,8 @@ target_vendor = @target_vendor@
vm_classes = @vm_classes@ vm_classes = @vm_classes@
# lib first, to compile .class files before native code, last examples # lib first, to compile .class files before native code, last examples
SUBDIRS = lib doc external include native resource scripts $(EXAMPLESDIR) SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR)
DIST_SUBDIRS = lib doc external include native resource scripts examples DIST_SUBDIRS = lib doc external include native resource scripts tools examples
ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config ACLOCAL_AMFLAGS = -I m4 -I ../.. -I ../../config
EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \ EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE \
ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 \ ChangeLog-2003 ChangeLog-2004 ChangeLog-2005 \
......
libjava/classpath/tools/Makefile.am
...@@ -21,66 +21,59 @@ endif ...@@ -21,66 +21,59 @@ endif
endif endif
endif endif
if CREATE_WRAPPERS ## GCJ LOCAL: do not build and install wrapper binaries here, since
bin_SCRIPTS = ## the build ordering will not work. Instead build them in
bin_PROGRAMS = gappletviewer gjarsigner gkeytool ## gcc/libjava/Makefile.am.
# if CREATE_WRAPPERS
# bin_SCRIPTS =
# bin_PROGRAMS = gappletviewer gjarsigner gkeytool
# if FOUND_GCJ
# LIBJVM = -lgcj
# else
# if FOUND_CACAO
# LIBJVM = -ljvm
# else
# LIBJVM =
# endif
# endif
# AM_CPPFLAGS = -Wall \
# -I$(top_srcdir)/include \
# -DTOOLS_ZIP="\"$(TOOLSdir)/$(TOOLS_ZIP)\""
# gappletviewer_SOURCES = toolwrapper.c
# gappletviewer_CFLAGS = \
# -DTOOLPACKAGE="\"appletviewer\"" \
# -DTOOLNAME="\"gappletviewer\""
# gappletviewer_LDFLAGS = -L$(libdir) $(LIBJVM)
# gjarsigner_SOURCES = toolwrapper.c
# gjarsigner_CFLAGS = \
# -DTOOLPACKAGE="\"jarsigner\"" \
# -DTOOLNAME="\"gjarsigner\""
# gjarsigner_LDFLAGS = -L$(libdir) $(LIBJVM)
# gkeytool_SOURCES = toolwrapper.c
# gkeytool_CFLAGS = \
# -DTOOLPACKAGE="\"keytool\"" \
# -DTOOLNAME="\"gkeytool\""
# gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM)
# else
# bin_SCRIPTS = gappletviewer gjarsigner gkeytool
# bin_PROGRAMS =
# endif
EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in
if FOUND_GCJ # All our example java source files
LIBJVM = -lgcj TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java
else
if FOUND_CACAO
LIBJVM = -ljvm
else
LIBJVM =
endif
endif
# Some architecture independent data to be installed.
TOOLS_DATA = $(TOOLS_ZIP)
# Where we want these data files installed.
## GCJ LOCAL: install libgcj-tools.jar alongside libgcj.jar.
TOOLSdir = $(datadir)/java
# The zip files with classes we want to produce. # The zip files with classes we want to produce.
## GCJ LOCAL: rename tools.zip libgcj-tools-$(gcc_version).jar
TOOLS_ZIP = libgcj-tools-$(gcc_version).jar
## GCJ LOCAL: calculate GCC version
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\""
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\""
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\""
gkeytool_LDFLAGS = -L$(libdir) $(LIBJVM)
else ## GCJ LOCAL: rename this tools.jar for libgcj_tools_la_SOURCES in
bin_SCRIPTS = appletviewer jarsigner keytool ## gcc/libjava/Makefile.am.
bin_PROGRAMS = TOOLS_ZIP = tools.jar
endif
EXTRA_DIST = toolwrapper.c appletviewer.in jarsigner.in keytool.in
# All our example java source files
TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*.java $(srcdir)/gnu/classpath/tools/*/*.java $(srcdir)/gnu/classpath/tools/*/*/*.java
# Extra objects that will not exist until configure-time # Extra objects that will not exist until configure-time
BUILT_SOURCES = $(TOOLS_ZIP) BUILT_SOURCES = $(TOOLS_ZIP)
...@@ -103,6 +96,16 @@ READMES = $(srcdir)/gnu/classpath/tools/giop/README ...@@ -103,6 +96,16 @@ READMES = $(srcdir)/gnu/classpath/tools/giop/README
# All the files we find "interesting" # All the files we find "interesting"
ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(TOOLS_TEMPLATES) $(TOOLS_HELPS) ALL_TOOLS_FILES = $(TOOLS_JAVA_FILES) $(TOOLS_TEMPLATES) $(TOOLS_HELPS)
## GCJ LOCAL: build tools.zip but do not install it. It is installed
## in gcc/libjava/Makefile.am.
# # Some architecture independent data to be installed.
# TOOLS_DATA = $(TOOLS_ZIP)
noinst_DATA = $(TOOLS_ZIP)
# Where we want these data files installed.
## GCJ LOCAL: install libgcj-tools.jar alongside libgcj.jar.
# TOOLSdir = $(datadir)/java
# Make sure everything is included in the distribution. # Make sure everything is included in the distribution.
dist-hook: dist-hook:
srcdir_cnt=`echo $(srcdir) | wc -c`; \ srcdir_cnt=`echo $(srcdir) | wc -c`; \
...@@ -121,6 +124,7 @@ dist-hook: ...@@ -121,6 +124,7 @@ dist-hook:
# the class files. Always regenerate all .class files and remove them # the class files. Always regenerate all .class files and remove them
# immediately. And copy the template files we use to the classes dir # immediately. And copy the template files we use to the classes dir
# so they get also included. # so they get also included.
## GCJ LOCAL: assume FASTJAR since we pass --with-fastjar to configure
$(TOOLS_ZIP): $(TOOLS_JAVA_FILES) $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
mkdir -p classes/gnu/classpath/tools/giop/grmic/templates mkdir -p classes/gnu/classpath/tools/giop/grmic/templates
mkdir -p classes/gnu/classpath/tools/rmi/rmic/templates mkdir -p classes/gnu/classpath/tools/rmi/rmic/templates
......
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