aboutsummaryrefslogtreecommitdiff
path: root/libjava/classpath/tools
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/classpath/tools')
-rwxr-xr-xlibjava/classpath/tools/Makefile.am2
-rw-r--r--libjava/classpath/tools/Makefile.in17
-rw-r--r--libjava/classpath/tools/classes/com/sun/tools/javah/Main.classbin0 -> 692 bytes
-rw-r--r--libjava/classpath/tools/com/sun/tools/javah/Main.java58
-rw-r--r--libjava/classpath/tools/gappletviewer.in1
-rw-r--r--libjava/classpath/tools/gjar.in1
-rw-r--r--libjava/classpath/tools/gjarsigner.in1
-rw-r--r--libjava/classpath/tools/gjavah.in1
-rw-r--r--libjava/classpath/tools/gkeytool.in1
-rw-r--r--libjava/classpath/tools/gnative2ascii.in1
-rw-r--r--libjava/classpath/tools/gorbd.in1
-rw-r--r--libjava/classpath/tools/grmic.in1
-rw-r--r--libjava/classpath/tools/grmid.in1
-rw-r--r--libjava/classpath/tools/grmiregistry.in1
-rw-r--r--libjava/classpath/tools/gserialver.in1
-rw-r--r--libjava/classpath/tools/gtnameserv.in1
16 files changed, 85 insertions, 4 deletions
diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index f9f9dbd6e3d..2ab650201e8 100755
--- a/libjava/classpath/tools/Makefile.am
+++ b/libjava/classpath/tools/Makefile.am
@@ -110,6 +110,7 @@ TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \
$(srcdir)/com/sun/javadoc/*.java \
$(srcdir)/com/sun/tools/doclets/*.java \
$(srcdir)/com/sun/tools/javac/*.java \
+ $(srcdir)/com/sun/tools/javah/*.java \
$(srcdir)/sun/rmi/rmic/*.java \
$(srcdir)/external/asm/org/objectweb/asm/*.java \
$(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \
@@ -168,6 +169,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
$(srcdir)/com/sun/javadoc \
$(srcdir)/com/sun/tools/doclets \
$(srcdir)/com/sun/tools/javac \
+ $(srcdir)/com/sun/tools/javah \
$(srcdir)/sun/rmi/rmic \
-name '*.java' -print > classes.lst
if [ -f $(top_builddir)/../vm-tools-packages ]; then \
diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in
index c9e74861623..2d730aadbc3 100644
--- a/libjava/classpath/tools/Makefile.in
+++ b/libjava/classpath/tools/Makefile.in
@@ -201,6 +201,8 @@ CREATE_DSSI_LIBRARIES_FALSE = @CREATE_DSSI_LIBRARIES_FALSE@
CREATE_DSSI_LIBRARIES_TRUE = @CREATE_DSSI_LIBRARIES_TRUE@
CREATE_GCONF_PEER_LIBRARIES_FALSE = @CREATE_GCONF_PEER_LIBRARIES_FALSE@
CREATE_GCONF_PEER_LIBRARIES_TRUE = @CREATE_GCONF_PEER_LIBRARIES_TRUE@
+CREATE_GSTREAMER_PEER_LIBRARIES_FALSE = @CREATE_GSTREAMER_PEER_LIBRARIES_FALSE@
+CREATE_GSTREAMER_PEER_LIBRARIES_TRUE = @CREATE_GSTREAMER_PEER_LIBRARIES_TRUE@
CREATE_GTK_PEER_LIBRARIES_FALSE = @CREATE_GTK_PEER_LIBRARIES_FALSE@
CREATE_GTK_PEER_LIBRARIES_TRUE = @CREATE_GTK_PEER_LIBRARIES_TRUE@
CREATE_JNI_HEADERS_FALSE = @CREATE_JNI_HEADERS_FALSE@
@@ -239,8 +241,6 @@ EXEEXT = @EXEEXT@
FASTJAR = @FASTJAR@
FGREP = @FGREP@
FIND = @FIND@
-FOUND_CACAO_FALSE = @FOUND_CACAO_FALSE@
-FOUND_CACAO_TRUE = @FOUND_CACAO_TRUE@
FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@
FOUND_ECJ_TRUE = @FOUND_ECJ_TRUE@
FOUND_GCJ_FALSE = @FOUND_GCJ_FALSE@
@@ -264,6 +264,15 @@ GJDOC = @GJDOC@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
+GSTREAMER_BASE_CFLAGS = @GSTREAMER_BASE_CFLAGS@
+GSTREAMER_BASE_LIBS = @GSTREAMER_BASE_LIBS@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_FILE_READER = @GSTREAMER_FILE_READER@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
+GSTREAMER_MIXER_PROVIDER = @GSTREAMER_MIXER_PROVIDER@
+GSTREAMER_PLUGINS_BASE_CFLAGS = @GSTREAMER_PLUGINS_BASE_CFLAGS@
+GSTREAMER_PLUGINS_BASE_LIBS = @GSTREAMER_PLUGINS_BASE_LIBS@
+GST_PLUGIN_LDFLAGS = @GST_PLUGIN_LDFLAGS@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
INIT_LOAD_LIBRARY = @INIT_LOAD_LIBRARY@
@@ -336,8 +345,6 @@ USER_CLASSLIB = @USER_CLASSLIB@
USER_JAVAH = @USER_JAVAH@
USER_SPECIFIED_CLASSLIB_FALSE = @USER_SPECIFIED_CLASSLIB_FALSE@
USER_SPECIFIED_CLASSLIB_TRUE = @USER_SPECIFIED_CLASSLIB_TRUE@
-USER_SPECIFIED_JAVAH_FALSE = @USER_SPECIFIED_JAVAH_FALSE@
-USER_SPECIFIED_JAVAH_TRUE = @USER_SPECIFIED_JAVAH_TRUE@
USE_ESCHER_FALSE = @USE_ESCHER_FALSE@
USE_ESCHER_TRUE = @USE_ESCHER_TRUE@
USE_PREBUILT_GLIBJ_ZIP_FALSE = @USE_PREBUILT_GLIBJ_ZIP_FALSE@
@@ -498,6 +505,7 @@ TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \
$(srcdir)/com/sun/javadoc/*.java \
$(srcdir)/com/sun/tools/doclets/*.java \
$(srcdir)/com/sun/tools/javac/*.java \
+ $(srcdir)/com/sun/tools/javah/*.java \
$(srcdir)/sun/rmi/rmic/*.java \
$(srcdir)/external/asm/org/objectweb/asm/*.java \
$(srcdir)/external/asm/org/objectweb/asm/attrs/*.java \
@@ -1109,6 +1117,7 @@ $(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
$(srcdir)/com/sun/javadoc \
$(srcdir)/com/sun/tools/doclets \
$(srcdir)/com/sun/tools/javac \
+ $(srcdir)/com/sun/tools/javah \
$(srcdir)/sun/rmi/rmic \
-name '*.java' -print > classes.lst
if [ -f $(top_builddir)/../vm-tools-packages ]; then \
diff --git a/libjava/classpath/tools/classes/com/sun/tools/javah/Main.class b/libjava/classpath/tools/classes/com/sun/tools/javah/Main.class
new file mode 100644
index 00000000000..b1f830df2d1
--- /dev/null
+++ b/libjava/classpath/tools/classes/com/sun/tools/javah/Main.class
Binary files differ
diff --git a/libjava/classpath/tools/com/sun/tools/javah/Main.java b/libjava/classpath/tools/com/sun/tools/javah/Main.java
new file mode 100644
index 00000000000..7eb0f37a85c
--- /dev/null
+++ b/libjava/classpath/tools/com/sun/tools/javah/Main.java
@@ -0,0 +1,58 @@
+/* Main.java -- implement com.sun.tools.javah.Main
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package com.sun.tools.javah;
+
+import java.io.IOException;
+
+public class Main
+{
+
+ public static void main(String[] args)
+ {
+ try
+ {
+ gnu.classpath.tools.javah.Main.main(args);
+ }
+ catch (IOException e)
+ {
+ throw new IllegalArgumentException("An I/O error occurred " +
+ "in executing javah", e);
+ }
+ }
+}
diff --git a/libjava/classpath/tools/gappletviewer.in b/libjava/classpath/tools/gappletviewer.in
index 1057aba9733..721078bb79c 100644
--- a/libjava/classpath/tools/gappletviewer.in
+++ b/libjava/classpath/tools/gappletviewer.in
@@ -40,6 +40,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gjar.in b/libjava/classpath/tools/gjar.in
index df2da926c0c..da7581167e0 100644
--- a/libjava/classpath/tools/gjar.in
+++ b/libjava/classpath/tools/gjar.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gjarsigner.in b/libjava/classpath/tools/gjarsigner.in
index 071b8a6477d..e3abc6ce674 100644
--- a/libjava/classpath/tools/gjarsigner.in
+++ b/libjava/classpath/tools/gjarsigner.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gjavah.in b/libjava/classpath/tools/gjavah.in
index 3140e21e4b6..797721b9550 100644
--- a/libjava/classpath/tools/gjavah.in
+++ b/libjava/classpath/tools/gjavah.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gkeytool.in b/libjava/classpath/tools/gkeytool.in
index d35f08df7df..59516efe803 100644
--- a/libjava/classpath/tools/gkeytool.in
+++ b/libjava/classpath/tools/gkeytool.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gnative2ascii.in b/libjava/classpath/tools/gnative2ascii.in
index f886074b7b8..17d7cd7e006 100644
--- a/libjava/classpath/tools/gnative2ascii.in
+++ b/libjava/classpath/tools/gnative2ascii.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gorbd.in b/libjava/classpath/tools/gorbd.in
index ab1a19a8602..40d01eee2a1 100644
--- a/libjava/classpath/tools/gorbd.in
+++ b/libjava/classpath/tools/gorbd.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/grmic.in b/libjava/classpath/tools/grmic.in
index eabce0e498c..9b7314429c1 100644
--- a/libjava/classpath/tools/grmic.in
+++ b/libjava/classpath/tools/grmic.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/grmid.in b/libjava/classpath/tools/grmid.in
index aa4e1432ad1..7eefb769d65 100644
--- a/libjava/classpath/tools/grmid.in
+++ b/libjava/classpath/tools/grmid.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/grmiregistry.in b/libjava/classpath/tools/grmiregistry.in
index 5e2798fd3ad..d08120af922 100644
--- a/libjava/classpath/tools/grmiregistry.in
+++ b/libjava/classpath/tools/grmiregistry.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gserialver.in b/libjava/classpath/tools/gserialver.in
index dbc80f268ad..85aeea62d51 100644
--- a/libjava/classpath/tools/gserialver.in
+++ b/libjava/classpath/tools/gserialver.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip
diff --git a/libjava/classpath/tools/gtnameserv.in b/libjava/classpath/tools/gtnameserv.in
index c8e7484f6ff..4fbcf371313 100644
--- a/libjava/classpath/tools/gtnameserv.in
+++ b/libjava/classpath/tools/gtnameserv.in
@@ -41,6 +41,7 @@
##
prefix=@prefix@
+datarootdir=@datarootdir@
tools_dir=@datadir@/@PACKAGE@
tools_cp=${tools_dir}/tools.zip