- Added install and staging to jni/windows
- Cleaned up staging target
Review by: jat (TBR)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@1986 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/jni/linux/Makefile b/jni/linux/Makefile
index b16bf50..8b3a8cf 100644
--- a/jni/linux/Makefile
+++ b/jni/linux/Makefile
@@ -25,6 +25,7 @@
OBJDIR := $(GWT_ROOT)build/out/jni/linux/
OUTDIR := $(GWT_ROOT)build/jni/linux/
OUT := $(OUTDIR)libgwt-ll.so
+STAGING := $(GWT_ROOT)build/staging/gwt-linux-0.0.0/
##
# The location to get .class files from for javah
@@ -142,7 +143,8 @@
# copy to staging area for hosted-mode development
##
staging: $(OUT)
- cp $(OUT) ../../build/staging/gwt-linux-0.0.0
+ @[ -d $(STAGING) ] || mkdir -p $(STAGING)
+ cp $(OUT) $(STAGING)
##
# Clean rule
diff --git a/jni/windows/Makefile b/jni/windows/Makefile
index 12dcbb8..14da521 100644
--- a/jni/windows/Makefile
+++ b/jni/windows/Makefile
@@ -19,6 +19,7 @@
OBJDIR := $(GWT_ROOT)build/out/jni/win32/
OUTDIR := $(GWT_ROOT)build/jni/win32/
OUT := $(OUTDIR)gwt-ll.dll
+STAGING := $(GWT_ROOT)build/staging/gwt-windows-0.0.0/
##
# Tools
@@ -67,6 +68,10 @@
##
all: $(OUT)
+# install into prebuilt directory
+install: $(OUT)
+ cp $(OUT) prebuilt/
+
##
# Include the dependency rules
##
@@ -95,6 +100,13 @@
$(STRIP) --strip-unneeded $@
##
+# copy to staging area for hosted-mode development
+##
+staging: $(OUT)
+ @[ -d $(STAGING) ] || mkdir -p $(STAGING)
+ cp $(OUT) $(STAGING)
+
+##
# Clean rule
##
clean:
