summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-10-10 03:47:34 +0200
committerFlorian Dold <florian.dold@gmail.com>2016-10-10 03:47:34 +0200
commit02fa518542328183f35ae04d389b61226f4c4e30 (patch)
tree74f4b0e27a239565f73e12e4164a4896d2c8d83b /Makefile
parentabd94a7f5a50f43c797a11b53549ae48fff667c3 (diff)
downloadwallet-core-02fa518542328183f35ae04d389b61226f4c4e30.tar.gz
wallet-core-02fa518542328183f35ae04d389b61226f4c4e30.tar.bz2
wallet-core-02fa518542328183f35ae04d389b61226f4c4e30.zip
adjust makefile to node_modules in repo
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 0ce145983..a4ddad238 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ gulp = node_modules/gulp/bin/gulp.js
tsc = node_modules/typescript/bin/tsc
po2json = node_modules/po2json/bin/po2json
-.PHONY: node_modules pogen i18n/strings.js
+.PHONY: pogen i18n/strings.js
package-stable: tsc i18n
$(gulp) package-stable
@@ -14,18 +14,18 @@ package-stable: tsc i18n
package-unstable: tsc i18n
$(gulp) package-unstable
-tsc: tsconfig.json node_modules
+tsc: tsconfig.json
$(tsc)
-tsconfig.json: gulpfile.js node_modules
+tsconfig.json: gulpfile.js
$(gulp) tsconfig
i18n: pogen msgmerge i18n/strings.js
-pogen/pogen.js: pogen/pogen.ts pogen/tsconfig.json node_modules
+pogen/pogen.js: pogen/pogen.ts pogen/tsconfig.json
cd pogen; ../$(tsc)
-pogen: $(ts) pogen/pogen.js node_modules
+pogen: $(ts) pogen/pogen.js
find $(src) \( -name '*.ts' -or -name '*.tsx' \) ! -name '*.d.ts' \
| xargs node pogen/pogen.js \
| msguniq \
@@ -38,13 +38,13 @@ msgmerge:
msgmerge -o $$pofile $$pofile i18n/$(poname).pot; \
done; \
-dist: node_modules
+dist:
$(gulp) srcdist
appdist:
$(gulp) appdist
-i18n/strings.js: # $(ts) node_modules
+i18n/strings.js: # $(ts)
cp i18n/strings-prelude.js i18n/strings.js
for pofile in i18n/*.po; do \
b=`basename $$pofile`; \
@@ -53,6 +53,3 @@ i18n/strings.js: # $(ts) node_modules
(echo -n "i18n.strings['$$lang'] = "; cat $$pofile.json; echo ';') >> $@; \
done
-
-node_modules:
- npm install .