diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-26 23:40:14 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-02-26 23:40:14 +0000 |
| commit | 7f4211db0a38d9893d3d0a7da876b4f271b8590d (patch) | |
| tree | e371b031105f339394f10d7fba12e6ddc35a24c4 | |
| parent | 25e0801c3762e3dcb984b6ac682e4c2193c1f466 (diff) | |
| download | ATCD-7f4211db0a38d9893d3d0a7da876b4f271b8590d.tar.gz | |
ChangeLogTag: Sat Feb 26 15:35:42 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/utils/catior/Makefile.am | 19 | ||||
| -rw-r--r-- | TAO/utils/nslist/Makefile.am | 40 |
3 files changed, 32 insertions, 34 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2a5d1b2e019..2622eaf6b7f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Sat Feb 26 15:35:42 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * utils/catior/Makefile.am: + * utils/nslist/Makefile.am: + + Regenerated. + Sat Feb 26 15:17:19 2005 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/tests/Makefile.am: diff --git a/TAO/utils/catior/Makefile.am b/TAO/utils/catior/Makefile.am index a655c87cf86..6b173c8ae19 100644 --- a/TAO/utils/catior/Makefile.am +++ b/TAO/utils/catior/Makefile.am @@ -1,15 +1,20 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) + +bin_PROGRAMS = -## Makefile.catior.am +## Makefile.catior.am if BUILD_RT_CORBA -bin_PROGRAMS = catior +bin_PROGRAMS += catior catior_CPPFLAGS = \ -I$(ACE_ROOT) \ @@ -29,6 +34,8 @@ endif BUILD_RT_CORBA ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/utils/nslist/Makefile.am b/TAO/utils/nslist/Makefile.am index d8b34535ed9..1a208b23065 100644 --- a/TAO/utils/nslist/Makefile.am +++ b/TAO/utils/nslist/Makefile.am @@ -1,11 +1,14 @@ ## Process this file with automake to create Makefile.in +## +## $Id$ +## -ACE_ROOT = $(top_srcdir)/.. ACE_BUILDDIR = $(top_builddir)/.. -TAO_ROOT = $(top_srcdir) +ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) +TAO_ROOT = $(top_srcdir) -## Makefile.nsadd.am +## Makefile.nsadd.am bin_PROGRAMS = nsadd @@ -22,17 +25,10 @@ nsadd_SOURCES = \ nsadd_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.nsdel.am +## Makefile.nsdel.am bin_PROGRAMS += nsdel @@ -49,17 +45,10 @@ nsdel_SOURCES = \ nsdel_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la -## Makefile.nslist.am +## Makefile.nslist.am bin_PROGRAMS += nslist @@ -76,18 +65,13 @@ nslist_SOURCES = \ nslist_LDADD = \ $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORInterceptor.la \ - $(TAO_BUILDDIR)/tao/libTAO_ObjRefTemplate.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la ## Clean up template repositories, etc. clean-local: - -rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core - -rm -f gcctemp.c gcctemp so_locations + -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* + -rm -f gcctemp.c gcctemp so_locations *.ics + -rm -rf cxx_repository ptrepository ti_files + -rm -rf templateregistry ir.out -rm -rf ptrepository SunWS_cache Templates.DB |