Merge "Update makefile to build any native extensions in the vendor/google/oregano source tree."
diff --git a/package/google/google_dart_vm/google_dart_vm.mk b/package/google/google_dart_vm/google_dart_vm.mk
index 234179c..276860e 100644
--- a/package/google/google_dart_vm/google_dart_vm.mk
+++ b/package/google/google_dart_vm/google_dart_vm.mk
@@ -1,9 +1,16 @@
GOOGLE_DART_VM_SITE=http://dart.googlecode.com/svn/branches/bleeding_edge/deps/standalone.deps
GOOGLE_DART_VM_SITE_METHOD=gclient
GOOGLE_DART_VM_VERSION=30104
+GOOGLE_DART_VM_INSTALL_STAGING=YES
+
+ifeq ($(ARCH),arm)
+BTYPE=ReleaseARM
+else
+BTYPE=ReleaseMIPS
+endif
GOOGLE_DART_VM_MAKE_VARS=\
-BUILDTYPE=ReleaseMIPS \
+BUILDTYPE=$(BTYPE) \
NM.target="$(TARGET_NM)" \
CC.target="$(TARGET_CC)" \
LINK.target="$(TARGET_CXX)" \
@@ -12,12 +19,20 @@
define GOOGLE_DART_VM_BUILD_CMDS
$(MAKE) -C $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart $(GOOGLE_DART_VM_MAKE_VARS)
- $(TARGET_STRIP) $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart/out/ReleaseMIPS/dart
+ $(TARGET_STRIP) $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart/out/$(BTYPE)/dart
+endef
+
+
+define GOOGLE_DART_VM_INSTALL_STAGING_CMDS
+ mkdir -p $(STAGING_DIR)/usr/local/include
+ $(INSTALL) -D -m 0644 $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart/runtime/include/dart_api.h $(STAGING_DIR)/usr/local/include
+ $(INSTALL) -D -m 0644 $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart/runtime/include/dart_native_api.h $(STAGING_DIR)/usr/local/include
+ $(INSTALL) -D -m 0644 $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart/runtime/include/dart_mirrors_api.h $(STAGING_DIR)/usr/local/include
endef
define GOOGLE_DART_VM_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0755 -D $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart/out/ReleaseMIPS/dart $(TARGET_DIR)/usr/bin
+ $(INSTALL) -m 0755 -D $(BUILD_DIR)/$($(PKG)_BASE_NAME)/dart/out/$(BTYPE)/dart $(TARGET_DIR)/usr/bin
endef
$(eval $(call GENTARGETS))
diff --git a/package/google/google_oregano/google_oregano.mk b/package/google/google_oregano/google_oregano.mk
index 35a0072..aaf626e 100644
--- a/package/google/google_oregano/google_oregano.mk
+++ b/package/google/google_oregano/google_oregano.mk
@@ -1,9 +1,8 @@
GOOGLE_OREGANO_SITE=repo://vendor/google/oregano
-GOOGLE_OREGANO_DEPENDENCIES=\
- bcm_chromium google_miniclient google_dart_vm
+GOOGLE_OREGANO_DEPENDENCIES=google_dart_vm
define GOOGLE_OREGANO_BUILD_CMDS
- # Surprise, its just a script that runs in the dartvm
+ TARGET=$(TARGET_CROSS) CFLAGS="$(TARGET_CFLAGS)" INCLUDES=-I$(STAGING_DIR)/usr/local/include $(MAKE) -C $(@D)
endef
define GOOGLE_OREGANO_INSTALL_TARGET_CMDS
