[patch, icedtea-web] Don't include copies of jni.h and jni_md.h

[Dr Andrew John Hughes]

On 00:23 Thu 21 Oct     , Matthias Klose wrote:
> These headers are included in every JDK_HOME, no need to carry local copies.
> 
>    Matthias


My worry with doing this is that we rely on the bootstrap JDK for these files.
I've encountered issues with using the gcj versions for example, though gcj isn't
supported for other reasons too at present (masses of internal Oracle code usage).

But if it works reliably, please commit.  It would be better if the new include
was on the next line as that line is a bit wide as is.

> diff -r 1b3abd2b1e4f ChangeLog
> --- a/ChangeLog	Wed Oct 20 16:52:44 2010 -0400
> +++ b/ChangeLog	Thu Oct 21 00:17:46 2010 +0200
> @@ -1,3 +1,8 @@
> +2010-10-20  Matthias Klose  <doko at ubuntu.com>
> +
> +	* Makefile.am (LAUNCHER_FLAGS): Add -I$(BOOT_DIR)/include.
> +	* launcher/jni.h, launcher/jni_md.h: Remove.
> +
>  2010-10-20  Omair Majid  <omajid at redhat.com>
>  
>  	* AUTHORS: Add Francis Kung, Andrew Su, Joshua Sumali, Mark Wielaard and
> diff -r 1b3abd2b1e4f Makefile.am
> --- a/Makefile.am	Wed Oct 20 16:52:44 2010 -0400
> +++ b/Makefile.am	Thu Oct 21 00:17:46 2010 +0200
> @@ -96,7 +96,7 @@
>  PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
>  NETX_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/,$(LAUNCHER_OBJECTS))
>  LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
> -	-g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) \
> +	-g -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -DLAUNCHER_NAME='"java"' -I$(LAUNCHER_SRCDIR) -I$(BOOT_DIR)/include \
>  	-DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"'
>  LAUNCHER_LINK = -o $@ -Xlinker -O1 -Xlinker -z -Xlinker defs -L$(BOOT_DIR)/lib/$(INSTALL_ARCH_DIR) \
>  	-Wl,-soname=lib.so  -L $(BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli -Wl,-z -Wl,origin \


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8