[icedtea-web] Fix linking issues

[Dr Andrew John Hughes]

On 13:01 Wed 24 Nov     , Matthias Klose wrote:
> objects should appear before libraries on the command line, the link will fail 
> with ld --as-needed. And linking with -lc explicitely is not necessary.
> 
> Ok to checkin?
> 
>    Matthias
> 

Looks good.  Please commit.

> 2010-11-24  Matthias Klose  <doko at ubuntu.com>
> 
> 	* Makefile.am (LAUNCHER_LINK): Don't explicitely link with -lc.
> 
> 2010-11-24  Chris Coulson  <chris.coulson at canonical.com>
> 
> 	* Makefile.am (pluginappletviewer, javaws):
> 	Fix linking with --as-needed.
> 
>  
> diff -r dd77da50a226 Makefile.am
> --- a/Makefile.am	Tue Nov 23 10:05:06 2010 -0500
> +++ b/Makefile.am	Wed Nov 24 12:52:24 2010 +0100
> @@ -63,7 +63,7 @@
>  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 \
>  	-Wl,--allow-shlib-undefined -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(INSTALL_ARCH_DIR)/jli -Wl,-rpath \
> -	-Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli  -ldl -lc -lz
> +	-Wl,\$$ORIGIN/../jre/lib/$(INSTALL_ARCH_DIR)/jli -lpthread $(X11_CFLAGS) $(X11_LIBS) -ljli  -ldl -lz
>  PLUGIN_VERSION = IcedTea $(PACKAGE_VERSION)$(ICEDTEA_REV)$(ICEDTEA_PKG)
>  
>  EXTRA_DIST = $(NETX_SRCDIR) $(abs_top_srcdir)/plugin javaws.png javaws.desktop.in extra launcher
> @@ -149,7 +149,7 @@
>  	$(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "sun.applet.PluginMain" }' -DPROGNAME='"pluginappletviewer"'  -c -o $@ $<
>  
>  $(PLUGIN_DIR)/launcher/pluginappletviewer: $(PLUGIN_LAUNCHER_OBJECTS)
> -	$(CC) $(LAUNCHER_LINK) $(PLUGIN_LAUNCHER_OBJECTS)
> +	$(CC) $(PLUGIN_LAUNCHER_OBJECTS) $(LAUNCHER_LINK)
>  
>  clean-IcedTeaPlugin:
>  	rm -f $(PLUGIN_DIR)/launcher/*.o
> @@ -279,7 +279,7 @@
>  
>  $(NETX_DIR)/launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
>  	mkdir -p launcher
> -	$(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS)
> +	$(CC) $(NETX_LAUNCHER_OBJECTS) $(LAUNCHER_LINK)
>  
>  javaws.desktop: javaws.desktop.in
>  	sed "s#PATH_TO_JAVAWS#$(DESTDIR)$(bindir)/javaws#" < javaws.desktop.in > javaws.desktop


-- 
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