Unblocks issue 844, support for mouse wheel events. Upgrades linux hosted mode to mozilla 1.7.13. Commits r1086, r1087 in tools are part of this patch.
Patch by: jat
Review by: mmendez
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1088 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/jni/linux/Makefile b/jni/linux/Makefile
index c70f88e..f21a922 100644
--- a/jni/linux/Makefile
+++ b/jni/linux/Makefile
@@ -54,14 +54,17 @@
OBJS := $(addprefix $(OBJDIR),$(SRCS:.cpp=.o))
DEPS := $(addprefix $(OBJDIR),$(SRCS:.cpp=.d))
+MOZDIR = $(GWT_TOOLS)/sdk/mozilla-1.7.13
+MOZINC = $(MOZDIR)/include
+MOZLIB = $(MOZDIR)/lib
+
##
# Include path configuration
##
SYSINCS := \
$(JAVA_HOME)/include \
$(JAVA_HOME)/include/linux \
- $(GWT_TOOLS)/sdk/mozilla-1.7.12/include \
- $(GWT_TOOLS)/sdk/mozilla-1.7.12/include/extra
+ $(MOZINC) $(MOZINC)/extra
INCS := $(OBJDIR)
INCS := $(addprefix -I ,$(INCS)) $(addprefix -isystem ,$(SYSINCS))
@@ -70,7 +73,7 @@
# Libraries and library path
##
LIBS = xpcomglue_s
-LIBPATH = -L$(GWT_TOOLS)/sdk/mozilla-1.7.12/lib
+LIBPATH = -L$(MOZLIB)
LIBS := $(addprefix -l,$(LIBS))
# for notes on auto-dependency generation, see
@@ -130,7 +133,7 @@
##
# Actual output file
##
-$(OUT): $(OBJS) $(GWT_TOOLS)/sdk/mozilla-1.7.12/lib/libxpcomglue_s.a
+$(OUT): $(OBJS) $(MOZLIB)/libxpcomglue_s.a
@[ -d $(OUTDIR) ] || mkdir -p $(OUTDIR)
$(LD) -shared $(LDFLAGS) $(LIBPATH) -o $@ $^ $(LIBS)
$(STRIP) --strip-unneeded $@
