aboutsummaryrefslogtreecommitdiffstats
path: root/lib/gs
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-09-28 11:30:20 +0200
committerBjörn Gustavsson <[email protected]>2011-09-28 11:30:20 +0200
commitad6a940cea43cb816a7bbcacd00a91a300097b31 (patch)
tree16b070a344f665d9e6ad4cde36520f7624b853ff /lib/gs
parentbe8538809c571441e6543a677db58501634b7572 (diff)
parentd9ec7c91ca6ae019ad80b03fb184924bad8d6bc8 (diff)
downloadotp-ad6a940cea43cb816a7bbcacd00a91a300097b31.tar.gz
otp-ad6a940cea43cb816a7bbcacd00a91a300097b31.tar.bz2
otp-ad6a940cea43cb816a7bbcacd00a91a300097b31.zip
Merge branch 'bjorn/parallel-make/OTP-9451' into major
* bjorn/parallel-make/OTP-9451: ic documentation: Support parallel make system documentation: Support parallel make Support parallel make when running erl_interface tests odbc/c_src/Makefile.in: Support parallel make tools/c_src/Makefile.in: Support parallel make gs: Correct support for parallel make
Diffstat (limited to 'lib/gs')
-rw-r--r--lib/gs/src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile
index b3f11fb71b..964966ba00 100644
--- a/lib/gs/src/Makefile
+++ b/lib/gs/src/Makefile
@@ -90,7 +90,7 @@ clean:
# Special Build Targets
# ----------------------------------------------------
-gstk_generic.hrl: gs_make.erl ../ebin/gs.$(EMULATOR)
+gstk_generic.hrl: gs_make.erl ../ebin/gs_make.$(EMULATOR) ../ebin/gs.$(EMULATOR)
$(ERL) -pa $(EBIN) -s gs_make -s erlang halt -noshell
$(APP_TARGET): $(APP_SRC) ../vsn.mk