diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-22 17:02:07 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-22 17:02:07 +0000 |
| commit | 5739d4cfa3e14f8a8154e1714dca95e822e916b0 (patch) | |
| tree | 59476599f95b6dc2a071822f0594e08b1237243e | |
| parent | 39fe33c475bcdcf4a42bcd671b597b2ed6e32e55 (diff) | |
| download | ATCD-5739d4cfa3e14f8a8154e1714dca95e822e916b0.tar.gz | |
ChangeLogTag: Wed Nov 22 16:57:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am | 2 | ||||
| -rw-r--r-- | ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc | 7 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 47483db2f2e..70c25b03fae 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Wed Nov 22 16:57:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am: + + Regenerated. + + * performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc: + + Add automake specific includes definition to find headers + relative to source directory. + Wed Nov 22 16:48:58 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * Makefile.am: diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am index 6d0a1c0b6b9..ac4f8fc9a00 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am @@ -21,7 +21,7 @@ noinst_LTLIBRARIES = libPerf_Test.la libPerf_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I.. + -I$(srcdir)/.. libPerf_Test_la_SOURCES = \ Adaptive_Lock_Performance_Test_Base.cpp \ diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc index f6a879deacd..751d29dc1c1 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc +++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Synch_Benchmarks_Perf_Test.mpc @@ -7,5 +7,10 @@ project : acelib { after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib - includes += .. + + specific (automake) { + includes += $(srcdirs)/.. + } else { + includes += .. + } } |