diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-22 18:32:10 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-22 18:32:10 +0000 |
| commit | d6dd3131cc2786fa4f3b3fd7f9e8b0bb53937c8b (patch) | |
| tree | 84b56f3202246098cb92f897d98fa7bbbbae6ab3 | |
| parent | 5739d4cfa3e14f8a8154e1714dca95e822e916b0 (diff) | |
| download | ATCD-d6dd3131cc2786fa4f3b3fd7f9e8b0bb53937c8b.tar.gz | |
ChangeLogTag: Wed Nov 22 18:27:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am | 2 | ||||
| -rw-r--r-- | ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc | 7 |
3 files changed, 18 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 70c25b03fae..f565736bddf 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Wed Nov 22 18:27:39 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> + + * performance-tests/Synch-Benchmarks/Base_Test/Makefile.am: + + Regenerated. + + * performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc: + + Add automake specific includes definition to find headers + relative to source directory. + Wed Nov 22 16:57:55 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com> * performance-tests/Synch-Benchmarks/Perf_Test/Makefile.am: diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am index 1c31462be1e..f5f4158d270 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Makefile.am @@ -21,7 +21,7 @@ noinst_LTLIBRARIES = libBase_Test.la libBase_Test_la_CPPFLAGS = \ -I$(ACE_ROOT) \ -I$(ACE_BUILDDIR) \ - -I.. + -I$(srcdir)/.. libBase_Test_la_SOURCES = \ Baseline_Test.cpp \ diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc index 7b0de88e4c9..47d16a47bb3 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Synch_Benchmarks_Base_Test.mpc @@ -7,5 +7,10 @@ project : acelib { after += Synch_Lib libs += Synch_Lib libpaths += ../Synch_Lib - includes += .. + + specific (automake) { + includes += $(srcdir)/.. + } else { + includes += .. + } } |