diff options
| author | Steve Huston <shuston@riverace.com> | 2004-02-03 21:50:44 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-02-03 21:50:44 +0000 |
| commit | d902a28ccffca0d3bc2be4bc30942607699b63bd (patch) | |
| tree | 2d571e00c9a5e58444ac19805969e97125309295 | |
| parent | c94e457c9e0e23f59f9faaed80d14bfa9e17b90f (diff) | |
| download | ATCD-d902a28ccffca0d3bc2be4bc30942607699b63bd.tar.gz | |
ChangeLogTag:Tue Feb 3 16:21:49 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Client/Makefile.am | 2 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Dump_Restore/Makefile.am | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 36495999fa8..1cec316c8fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Feb 3 16:21:49 2004 Steve Huston <shuston@riverace.com> + + * m4/compiler.m4: If --disable-rtti is specified on AIX, add + -DACE_LACKS_RTTI to CXXFLAGS. + + * netsvcs/clients/Naming/Client/Makefile.am: + * netsvcs/clients/Naming/Dump_Restore/Makefile.am: Removed the + extraneous path prefix for the required same-directory libraries in + main_LDADD to allow the Makefile to see the library and build it + first at make time. + Tue Feb 3 14:35:53 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ace/config-win32-msvc-6.h: @@ -53,6 +64,7 @@ Mon Feb 2 13:48:23 2004 Chad Elliott <elliott_c@ociweb.com> that the custom build rules are processed before source files are compiled. +>>>>>>> 4.6400 Mon Feb 02 10:00:29 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> * ace/config-win32-msvc-6.h: diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am index 8a97e90f04e..95879536177 100644 --- a/netsvcs/clients/Naming/Client/Makefile.am +++ b/netsvcs/clients/Naming/Client/Makefile.am @@ -18,7 +18,7 @@ noinst_PROGRAMS = \ main main_SOURCES = main.cpp -main_LDADD = $(top_builddir)/netsvcs/clients/Naming/Client/libClient_Test.a \ +main_LDADD = libClient_Test.a \ $(top_builddir)/ace/libACE.la noinst_DATA = svc.conf svc2.conf diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am index d38bbe426f4..22a196c18fb 100644 --- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am +++ b/netsvcs/clients/Naming/Dump_Restore/Makefile.am @@ -20,7 +20,7 @@ noinst_PROGRAMS = \ main_SOURCES = main.cpp main_LDADD = \ - $(top_builddir)/netsvcs/clients/Naming/Dump_Restore/libDump_Restore.a \ + libDump_Restore.a \ $(top_builddir)/ace/libACE.la ## ACE currently doesn't build this so we don't build it with automake either. |