/hg/icedtea-web: Revert to using foreign to avoid warnings about...

[andrew at icedtea.classpath.org]

changeset fc0b251243fb in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fc0b251243fb
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Oct 19 18:19:19 2010 +0100

	Revert to using foreign to avoid warnings about GNU make syntax.

	2010-10-19 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (PLUGIN_LAUNCHER_OBJECTS): Do
	prefixing once. (NETX_LAUNCHER_OBJECTS): Likewise for NetX.
	(pluginappletviewer): Use PLUGIN_LAUNCHER_OBJECTS. (javaws):
	Use NETX_LAUNCHER_OBJECTS.
		* configure.ac: Re-enable foreign (I want to use GNU make!)
		* README: Use gmake not make.


diffstat:

4 files changed, 20 insertions(+), 7 deletions(-)
ChangeLog    |   11 +++++++++++
Makefile.am  |   10 ++++++----
README       |    4 ++--
configure.ac |    2 +-

diffs (76 lines):

diff -r dbc6a336b087 -r fc0b251243fb ChangeLog
--- a/ChangeLog	Tue Oct 19 17:55:59 2010 +0100
+++ b/ChangeLog	Tue Oct 19 18:19:19 2010 +0100
@@ -1,3 +1,14 @@ 2010-10-19  Andrew John Hughes  <ahughes
+2010-10-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(PLUGIN_LAUNCHER_OBJECTS): Do prefixing once.
+	(NETX_LAUNCHER_OBJECTS): Likewise for NetX.
+	(pluginappletviewer): Use PLUGIN_LAUNCHER_OBJECTS.
+	(javaws): Use NETX_LAUNCHER_OBJECTS.
+	* configure.ac: Re-enable foreign (I want to use
+	GNU make!)
+	* README: Use gmake not make.
+
 2010-10-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* .hgignore,
diff -r dbc6a336b087 -r fc0b251243fb Makefile.am
--- a/Makefile.am	Tue Oct 19 17:55:59 2010 +0100
+++ b/Makefile.am	Tue Oct 19 18:19:19 2010 +0100
@@ -92,6 +92,8 @@ endif
 
 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))
 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)"'
@@ -181,8 +183,8 @@ PLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedTea
 	mkdir -p $(PLUGIN_DIR)/launcher && \
 	$(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "sun.applet.PluginMain" }' -DPROGNAME='"pluginappletviewer"'  -c -o $@ $<
 
-$(PLUGIN_DIR)/launcher/pluginappletviewer: $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
-	$(CC) $(LAUNCHER_LINK) $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
+$(PLUGIN_DIR)/launcher/pluginappletviewer: $(PLUGIN_LAUNCHER_OBJECTS)
+	$(CC) $(LAUNCHER_LINK) $(PLUGIN_LAUNCHER_OBJECTS)
 
 clean-IcedTeaPlugin:
 	rm -f $(PLUGIN_DIR)/*.o
@@ -302,8 +304,8 @@ launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
 	$(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "-J-ms8m", "net.sourceforge.jnlp.runtime.Boot",  }' -DPROGNAME='"javaws"' \
 	-c -o $@ $<
 
-launcher/javaws: $(addprefix launcher/,$(LAUNCHER_OBJECTS))
-	$(CC) $(LAUNCHER_LINK) $(addprefix launcher/,$(LAUNCHER_OBJECTS))
+launcher/javaws: $(NETX_LAUNCHER_OBJECTS)
+	$(CC) $(LAUNCHER_LINK) $(NETX_LAUNCHER_OBJECTS)
 
 # plugin tests
 
diff -r dbc6a336b087 -r fc0b251243fb README
--- a/README	Tue Oct 19 17:55:59 2010 +0100
+++ b/README	Tue Oct 19 18:19:19 2010 +0100
@@ -48,8 +48,8 @@ IcedTea-Web is built using the standard:
 
 $ ./autogen.sh (if building from Mercurial rather than a tarball)
 $ ./configure
-$ make
-$ make install
+$ gmake
+$ gmake install
 
 incantation.  The build requirements are as follows:
 
diff -r dbc6a336b087 -r fc0b251243fb configure.ac
--- a/configure.ac	Tue Oct 19 17:55:59 2010 +0100
+++ b/configure.ac	Tue Oct 19 18:19:19 2010 +0100
@@ -1,5 +1,5 @@ AC_INIT([icedtea-web],[1.0pre],[distro-p
 AC_INIT([icedtea-web],[1.0pre],[distro-pkg-dev at openjdk.java.net])
-AM_INIT_AUTOMAKE([1.9 tar-pax])
+AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
 # Older automake doesn't generate these correctly