diff options
| author |  Rogan Creswick <creswick@gmail.com> | 2013-06-25 10:44:43 -0700 |
|---|---|---|
| committer | Rogan Creswick <creswick@gmail.com> | 2013-06-25 10:44:43 -0700 |
| commit | e166ed04bfe336f9e6340f7df1a50264f7d64622 (patch) | |
| tree | b2be288c69240e444ec70ece945f0ec59e667690 /src | |
| parent | 750bb02df87cb2731ee593b3206f1ac442fcd69d (diff) | |
| parent | 50e042c8981608e4121f94faec138db0c3e294e3 (diff) | |
Merge branch 'master' of https://github.com/GaloisInc/FiveUI
Diffstat (limited to 'src')
| -rw-r--r-- | src/js/chrome/build.mk | 1 | ||||
| -rw-r--r-- | src/js/firefox/build.mk | 8 | ||||
| -rw-r--r-- | src/js/fiveui/build.mk | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/js/chrome/build.mk b/src/js/chrome/build.mk index 30c07f3..f06fb20 100644 --- a/src/js/chrome/build.mk +++ b/src/js/chrome/build.mk @@ -6,6 +6,7 @@ all: stage-chrome package: $(build-dir)/fiveui.crx + chrome-dir := $(path) chrome-build := $(build-dir)/chrome diff --git a/src/js/firefox/build.mk b/src/js/firefox/build.mk index 0a20a80..36fad92 100644 --- a/src/js/firefox/build.mk +++ b/src/js/firefox/build.mk @@ -83,10 +83,8 @@ stage-firefox: \ $(firefox-build)/data/icons/options-icon.js \ | $(firefox-build) -$(build-dir)/fiveui.xpi: \ - stage-firefox \ - $(addon-sdk-unpacked) \ - $(topdir)/profiles/firefox +$(build-dir)/fiveui.xpi: stage-firefox \ + | $(topdir)/profiles/firefox $(addon-sdk-unpacked) $(call label,XPI $(call drop-prefix,$@))\ $(call cfx,$(build-dir),xpi -p $(topdir)/profiles/firefox \ --pkgdir=$(firefox-build) ) @@ -94,5 +92,5 @@ $(build-dir)/fiveui.xpi: \ # Testing ###################################################################### -run-firefox: stage-firefox $(addon-sdk-unpacked) +run-firefox: stage-firefox | $(addon-sdk-unpacked) $(call label,RUNFF)$(call cfx,$(firefox-build),run) diff --git a/src/js/fiveui/build.mk b/src/js/fiveui/build.mk index c9bbf7d..e229eed 100644 --- a/src/js/fiveui/build.mk +++ b/src/js/fiveui/build.mk @@ -29,7 +29,7 @@ define stage-fiveui # Common Files ################################################################# -$1/data/injected/injected.css: $(build-dir)/injected.css +$1/data/injected/injected.css: $(build-dir)/injected.css | $1/data/injected $$(call cmd,cp) $(call fiveui-files,$1/data,injected) @@ -58,7 +58,7 @@ $2: $(patsubst $(fiveui-dir)/%,$1/data/%,$(wildcard $(fiveui-dir)/images/*)) $1/data/jquery: | $1/data $$(call cmd,mkdir) -$1/data/jquery/bundled.css: $(build-dir)/bundled.css +$1/data/jquery/bundled.css: $(build-dir)/bundled.css | $1/data/jquery $$(call cmd,cp) $1/data/jquery/%: $(lib-dir)/jquery/% | $1/data/jquery |