diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-06 20:14:08 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-06 20:14:08 +0000 |
| commit | 8fbc646bdba3c5b808b2da758beaa326354ec877 (patch) | |
| tree | ffef1aa45868edbe1a9b95d6f300f3529e2c4b02 | |
| parent | 6f17ad66e8f1017c5dff2fc947ec0a8c452ae512 (diff) | |
| download | ATCD-8fbc646bdba3c5b808b2da758beaa326354ec877.tar.gz | |
ChangeLogTag: Mon Sep 06 15:05:17 1999 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | ChangeLog-99b | 44 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 12 |
2 files changed, 41 insertions, 15 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b index f3877316b0d..5bf97fc1d4d 100644 --- a/ChangeLog-99b +++ b/ChangeLog-99b @@ -1,25 +1,39 @@ +Mon Sep 06 15:05:17 1999 David L. Levine <levine@cs.wustl.edu> + + * ace/Makefile: moved ACELIB setting (to null) to before include + of rules.lib.GNU. That way, rules.lib.GNU can use the value of + $(ACELIB) to determine whether the ACE library object files + should be linked into the library, with repo=1. [Bug 248] + + * include/makeinclude/rules.lib.GNU: with repo=1 when building + static libs, except for libACE, include all of the ACE lib's + object files. The prevents multiple instantiations, by GNU + repo, of templates that are used in the ACE library. See the + gcc info pages, Template Instantiation node, for more information. + [Bug 248] + Mon Sep 6 08:45:31 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> - * examples/Reactor/WFMO_Reactor: Cleaned up some of the coding in - the examples. + * examples/Reactor/WFMO_Reactor: Cleaned up some of the coding in + the examples. - * ace/Profile_Timer.cpp: Reformatted the code a bit. + * ace/Profile_Timer.cpp: Reformatted the code a bit. - * examples/Threads/process_manager.cpp (main): Fixed some warnings - and errors. Thanks to David for reporting this. + * examples/Threads/process_manager.cpp (main): Fixed some warnings + and errors. Thanks to David for reporting this. - * ace/OS.i: Fixed ACE_UNUSED_ARG(options) to be - ACE_UNUSED_ARG(wait_options). Thanks to David's build logs for - reporting this. + * ace/OS.i: Fixed ACE_UNUSED_ARG(options) to be + ACE_UNUSED_ARG(wait_options). Thanks to David's build logs for + reporting this. - * tests/Signal_Test.cpp: Changed the types of parameters passed - to run_test() from int to long so that we can safely cast them - to and from void *'s. Thanks to David Levine for pointing this - out. + * tests/Signal_Test.cpp: Changed the types of parameters passed + to run_test() from int to long so that we can safely cast them + to and from void *'s. Thanks to David Levine for pointing this + out. - * ace/Process_Manager.cpp (notify_proc_handler): Removed - the now unused parameter h. Thanks to David for pointing this - out. + * ace/Process_Manager.cpp (notify_proc_handler): Removed + the now unused parameter h. Thanks to David for pointing this + out. Mon Sep 06 07:25:01 1999 David L. Levine <levine@cs.wustl.edu> diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 5884f082641..c2384aa6c23 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -78,6 +78,18 @@ endif VLIB = $(LIB:%.a=%$(VAR).a) $(VLIB): $(VLOBJS) + +ifeq (1,$(repo)) + ifneq (,$(ACELIB)) + #### With repo, link in all of the ace object files to the lib. + #### This avoids multiple instantiations. We haven't found it to + #### be necessary with shared libs, so just do it for static libs. + vpath %.o $(ACE_ROOT)/ace/$(VDIR) + + $(VLIB): $(ACE_ROOT)/ace/$(VDIR)*.o + endif # ! ACELIB +endif # repo + ifdef PRELIB $(PRELIB) endif |