diff options
| author | Jose <jose@zeroc.com> | 2016-03-29 11:17:11 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-29 11:17:11 +0200 |
| commit | 02917ac4d61935bed99c4499ef92f2e40b6035b5 (patch) | |
| tree | 982a02d64eaab586bc24b64d43a65c7df7b0e7b6 | |
| parent | Windos MINGW missing shlwapi library (diff) | |
| download | ice-02917ac4d61935bed99c4499ef92f2e40b6035b5.tar.bz2 ice-02917ac4d61935bed99c4499ef92f2e40b6035b5.tar.xz ice-02917ac4d61935bed99c4499ef92f2e40b6035b5.zip | |
Install rules fixes
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makefile.mak | 11 | ||||
| -rw-r--r-- | js/Makefile | 5 | ||||
| -rw-r--r-- | js/Makefile.mak | 3 |
4 files changed, 9 insertions, 12 deletions
@@ -10,7 +10,7 @@ SUBDIRS = cpp java js python ruby php CLEAN_SUBDIRS = js java python ruby php cpp DEPEND_SUBDIRS = cpp python ruby php -INSTALL_SUBDIRS = cpp java python ruby php js +INSTALL_SUBDIRS = cpp java python ruby php ifeq ($(shell uname),Darwin) SUBDIRS += objective-c diff --git a/Makefile.mak b/Makefile.mak index 5c6117756d4..7933251a577 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -21,7 +21,7 @@ TEST_SUBDIRS = cpp python SUBDIRS = cpp java js csharp CLEAN_SUBDIRS = cpp java js csharp DEPEND_SUBDIRS = cpp java js csharp -INSTALL_SUBDIRS = cpp java js csharp +INSTALL_SUBDIRS = cpp java csharp TEST_SUBDIRS = cpp java js csharp !endif @@ -39,7 +39,7 @@ all:: cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1 clean:: - @for %i in ( $(SUBDIRS) ) do \ + @for %i in ( $(CLEAN_SUBDIRS) ) do \ @echo "making clean in %i" && \ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) clean" || exit 1 @@ -49,12 +49,12 @@ depend:: cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) depend" || exit 1 install:: - @for %i in ( $(TEST_SUBDIRS) ) do \ + @for %i in ( $(INSTALL_SUBDIRS) ) do \ @echo "making install in %i" && \ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) install" || exit 1 test:: - @for %i in ( $(SUBDIRS) ) do \ + @for %i in ( $(TEST_SUBDIRS) ) do \ @echo "making test in %i" && \ cmd /c "cd %i && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) test" || exit 1 @@ -78,3 +78,6 @@ php:: @echo "making all in php" && \ cmd /c "cd php && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1 +js:: + @echo "making all in js" && \ + cmd /c "cd js && $(MAKE) -nologo -f Makefile.mak $(MAKEFLAGS) all" || exit 1 diff --git a/js/Makefile b/js/Makefile index 63c606450a3..356df4acb72 100644 --- a/js/Makefile +++ b/js/Makefile @@ -20,9 +20,6 @@ dist: npminstall clean: npminstall $(NPM) run gulp:clean -install: npminstall - $(NPM) run gulp:install - lint: npminstall $(NPM) run gulp:lint @@ -30,4 +27,4 @@ test: @python ./allTests.py npminstall: - $(NPM) install
\ No newline at end of file + $(NPM) install diff --git a/js/Makefile.mak b/js/Makefile.mak index 3b08e3a5087..1c76e0fccfa 100644 --- a/js/Makefile.mak +++ b/js/Makefile.mak @@ -20,9 +20,6 @@ dist: npminstall clean: npminstall $(NPM) run gulp:clean -install:: npminstall - $(NPM) run gulp:install - lint:: npminstall $(NPM) run gulp:lint |