diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
4 files changed, 20 insertions, 7 deletions
@@ -1,5 +1,16 @@ 2010-10-19 Andrew John Hughes <[email protected]> + * 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 <[email protected]> + * .hgignore, * Makefile.am, * acinclude.m4, diff --git a/Makefile.am b/Makefile.am index 536f2a2..fed7a0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c 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 @@ -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 --git a/configure.ac b/configure.ac index 67b08e8..bd20ae6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([icedtea-web],[1.0pre],[[email protected]]) -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 |