/hg/icedtea-web: 2010-10-20 Matthias Klose <doko at ubuntu.com>

[Dr Andrew John Hughes]

On 10:01 Wed 20 Oct     , doko at icedtea.classpath.org wrote:
> changeset c63223d1132b in /hg/icedtea-web
> details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c63223d1132b
> author: doko at ubuntu.com
> date: Wed Oct 20 11:57:18 2010 +0200
> 
> 	2010-10-20 Matthias Klose <doko at ubuntu.com>
> 
> 	 * Makefile.am: Fix build with builddir != srcdir.
> 
> 
> diffstat:
> 
> 2 files changed, 6 insertions(+), 1 deletion(-)
> ChangeLog   |    4 ++++
> Makefile.am |    3 ++-
> 
> diffs (31 lines):
> 
> diff -r fc0b251243fb -r c63223d1132b ChangeLog
> --- a/ChangeLog	Tue Oct 19 18:19:19 2010 +0100
> +++ b/ChangeLog	Wed Oct 20 11:57:18 2010 +0200
> @@ -1,3 +1,7 @@ 2010-10-19  Andrew John Hughes  <ahughes
> +2010-10-20  Matthias Klose  <doko at ubuntu.com>
> +
> +	* Makefile.am: Fix build with builddir != srcdir.
> +
>  2010-10-19  Andrew John Hughes  <ahughes at redhat.com>
>  
>  	* Makefile.am:
> diff -r fc0b251243fb -r c63223d1132b Makefile.am
> --- a/Makefile.am	Tue Oct 19 18:19:19 2010 +0100
> +++ b/Makefile.am	Wed Oct 20 11:57:18 2010 +0200
> @@ -93,7 +93,7 @@ LAUNCHER_SRCDIR = $(abs_top_srcdir)/laun
>  LAUNCHER_SRCDIR = $(abs_top_srcdir)/launcher
>  LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o
>  PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
> -NETX_LAUNCHER_OBJECTS = $(addprefix $(abs_top_builddir)/launcher/,$(LAUNCHER_OBJECTS))
> +NETX_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_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) \
>  	-DJDK_MAJOR_VERSION='"1"' -DJDK_MINOR_VERSION='"6"' -DLIBARCHNAME='"$(JRE_ARCH_DIR)"'
> @@ -305,6 +305,7 @@ launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
>  	-c -o $@ $<
>  
>  launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
> +	mkdir -p launcher
>  	$(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS)
>  
>  # plugin tests

The launcher objects shouldn't go in the same directory.
-- 
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