diff options
| author | Steve Huston <shuston@riverace.com> | 2004-01-12 19:28:50 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-01-12 19:28:50 +0000 |
| commit | 67ae17b40ae0a293ae39e1797edc1e0f47eb112e (patch) | |
| tree | 1ac38379b94c0b521e81c09beaa374d1acb0c6e5 | |
| parent | 46c501a782f7919d97ddde57ac90a4a6bcf14dd2 (diff) | |
| download | ATCD-67ae17b40ae0a293ae39e1797edc1e0f47eb112e.tar.gz | |
ChangeLogTag:Mon Jan 12 14:24:39 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 1f66b35e54d..879cc18606c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jan 12 14:24:39 2004 Steve Huston <shuston@riverace.com> + + * tests/Makefile.am: Remove $(libdir) from libTest_Output.la listed + in dependencies - having it there caused it to not match the + plain libTest_Output.la target in the Makefile, and thus not + get built before many of the tests. Added libTest_Output.la to + the DLL_Test and Service_Config_Test dependencies. + Mon Jan 12 15:54:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * apps/JAWS/server/jaws.dsp: diff --git a/tests/Makefile.am b/tests/Makefile.am index 482067c371a..581ed64bdf7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -44,7 +44,7 @@ libdir = @ACE_TESTS_DIR@ ## ## We override the "LIBS" variable provided by the configure script since ## we should only need to link against the ACE library for these tests. -LDADD = Main.o $(libdir)/libTest_Output.la $(top_builddir)/ace/libACE.la +LDADD = Main.o libTest_Output.la $(top_builddir)/ace/libACE.la ##LIBS = $(top_builddir)/ace/libACE.la noinst_SCRIPTS = \ @@ -286,7 +286,7 @@ Conn_Test_SOURCES = Conn_Test.cpp Conn_Test.h DLList_Test_SOURCES = DLList_Test.cpp DLL_Test_SOURCES = DLL_Test.cpp DLL_Test.h -DLL_Test_DEPENDENCIES = libDLL_Test.la +DLL_Test_DEPENDENCIES = libDLL_Test.la libTest_Output.la Date_Time_Test_SOURCES = Date_Time_Test.cpp @@ -455,7 +455,7 @@ SV_Shared_Memory_Test_SOURCES = SV_Shared_Memory_Test.cpp Semaphore_Test_SOURCES = Semaphore_Test.cpp Service_Config_Test_SOURCES = Service_Config_Test.cpp -Service_Config_Test_DEPENDENCIES = libService_Config_DLL.la +Service_Config_Test_DEPENDENCIES = libService_Config_DLL.la libTest_Output.la Signal_Test_SOURCES = Signal_Test.cpp |