From 921c4d826ab352b2fd871569706aadd69448a6c0 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 26 Jan 2018 05:33:41 +0300 Subject: [PATCH] minor tweaks... Signed-off-by: Alex A. Naanou --- ui (gen4)/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index 5ab00ff3..bded7a43 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -523,6 +523,9 @@ $(DIST_DIR)/$(APP_NAME)-$(VERSION)-web.zip: $(PACK_MINIMAL) # Electron desktop build... # get the electron binary (keep this cached)... +.PHONY: electron-target +electron-target: $(TARGET_DIR)/$(ELECTRON_DIST) + .PRECIOUS: $(TARGET_DIR)/$(ELECTRON_DIST) $(TARGET_DIR)/$(ELECTRON_DIST): $(MD) "$(@D)" @@ -531,10 +534,6 @@ $(TARGET_DIR)/$(ELECTRON_DIST): -O "$@" -.PHONY: electron-target -electron-target: $(TARGET_DIR)/$(ELECTRON_DIST) - - # pack app.asar (electron-specific)... .PRECIOUS: $(BUILD_DIR)/app.asar # XXX do we need to track changes to pack-full or to build it only if @@ -607,6 +606,9 @@ $(DIST_DIR)/$(APP_NAME)-%.zip: $(BUILD_DIR)/$(APP_NAME)-%.$(BUILD_MODE).zip #---------------------------------------------------------------------- # NW.js... +.PHONY: nw-target +nw-target: $(TARGET_DIR)/$(NW_DIST) + .PRECIOUS: $(TARGET_DIR)/$(NW_DIST) $(TARGET_DIR)/$(NW_DIST): $(MD) "$(@D)" @@ -615,10 +617,6 @@ $(TARGET_DIR)/$(NW_DIST): -O "$@" -.PHONY: nw-target -nw-target: $(TARGET_DIR)/$(NW_DIST) - - # NOTE: this needs a clean app dir... .PRECIOUS: $(BUILD_DIR)/package.nw $(BUILD_DIR)/package.nw: INCLUDE_NODE_MODULES += $(INCLUDE_NW_NODE_MODULES) @@ -631,6 +629,7 @@ $(BUILD_DIR)/package.nw: $$(PACK_MINIMAL) $(call zipFrom,$<,$@,*) +# XXX how do we resolve name collisions between this and electron builds??? # XXX things to do next: # - copy rest of node_modules... # - pack...