diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-09 18:28:24 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-12-09 18:28:24 +0000 |
| commit | 73bb184abc978f6d7f16006312340fb1bb96e02e (patch) | |
| tree | 24c9e57905f6cf4082446706e3a3bc680b6124dc | |
| parent | b627253e6c6e7b45912395c5b8f3dcf7750db9d4 (diff) | |
| download | ATCD-73bb184abc978f6d7f16006312340fb1bb96e02e.tar.gz | |
ChangeLogTag:Tue Dec 9 18:38:12 UTC 2003 Don Hinton <dhinton@dresystems.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.CosTime | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 90e5240f765..f22e0826eb6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Dec 9 18:38:12 UTC 2003 Don Hinton <dhinton@dresystems.com> + + * orbsvcs/orbsvcs/Makefile.CosTime: + Removed #include of wrapper_macros.GNU and rules.tao.GNU since + they are included automagically by all_in_one.GNU. Thanks to + Johnny Willemsen <jwillemsen@remedy.nl> tracking this down. + Tue Dec 9 11:37:44 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/extra_core.mpb: diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosTime b/TAO/orbsvcs/orbsvcs/Makefile.CosTime index 0f8c7d1a3af..bab447c3e5b 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.CosTime +++ b/TAO/orbsvcs/orbsvcs/Makefile.CosTime @@ -22,9 +22,6 @@ ACE_SHLIBS = -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_PortableServer -lTAO -lACE # Include macros and targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(TAO_ROOT)/rules.tao.GNU - # On non-Windows environment, we should at least define # the export_include IDL flag. override TAO_IDLFLAGS += \ |