Mercurial > hg > release > icedtea-web-1.0

changeset 1:fc0b251243fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert to using foreign to avoid warnings about GNU make syntax. 2010-10-19 Andrew John Hughes <ahughes@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.
author Andrew John Hughes <ahughes@redhat.com>
date Tue, 19 Oct 2010 18:19:19 +0100
parents dbc6a336b087
children c63223d1132b
files ChangeLog Makefile.am README configure.ac
diffstat 4 files changed, 20 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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@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@redhat.com>
 
 	* .hgignore,
--- 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 @@
 
 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 @@
 	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 @@
 	$(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
 
--- a/README	Tue Oct 19 17:55:59 2010 +0100
+++ b/README	Tue Oct 19 18:19:19 2010 +0100
@@ -48,8 +48,8 @@
 
 $ ./autogen.sh (if building from Mercurial rather than a tarball)
 $ ./configure
-$ make
-$ make install
+$ gmake
+$ gmake install
 
 incantation.  The build requirements are as follows:
 
--- 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-pkg-dev@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