summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rogers <[email protected]>2013-06-10 10:57:23 -0800
committerAndrew Boktor <[email protected]>2014-08-14 13:50:47 -0700
commited5da41343db26bb2c06b46a6c16a0dc78c0636a (patch)
treed9d56afc63f3a0ffb2427b377a932d3783bad329
parent5eebb5d3938302ffff1ab80e09bf6065e2fa1c92 (diff)
Adding a dependency so the ptxinto.tab.h file is generated before the lex.ptxinfo_.c file is built
review:42002 lgtm:1 [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 16432]
-rw-r--r--CHANGES1
-rw-r--r--src/cuda-sim/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 3fbb53e..671f4ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,6 +33,7 @@ Version 3.2.1+edits (development branch) versus 3.2.1
- 'Constant dynamic' power not included in average/min/max power values.
- Average/min/max per-kernel powers not being reset at kernel boundaries causing
incorrect per-kernel values.
+ - Fixed a dependency error in the src/cuda-sim Makefile.
Version 3.2.1 versus 3.2.0
- Added kernel name and launch uids to performance statistics log.
diff --git a/src/cuda-sim/Makefile b/src/cuda-sim/Makefile
index 8d33e19..51a9d8e 100644
--- a/src/cuda-sim/Makefile
+++ b/src/cuda-sim/Makefile
@@ -87,7 +87,7 @@ $(OUTPUT_DIR)/lex.ptx_.o: lex.ptx_.c
$(OUTPUT_DIR)/ptxinfo.tab.o: ptxinfo.tab.c
$(CPP) -c $(OPT) -DYYDEBUG ptxinfo.tab.c -o $(OUTPUT_DIR)/ptxinfo.tab.o
-$(OUTPUT_DIR)/lex.ptxinfo_.o: lex.ptxinfo_.c
+$(OUTPUT_DIR)/lex.ptxinfo_.o: lex.ptxinfo_.c ptxinfo.tab.c
$(CPP) -c $(OPT) lex.ptxinfo_.c -o $(OUTPUT_DIR)/lex.ptxinfo_.o
ptx.tab.c: ptx.y