diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 7 |
4 files changed, 27 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 854d01783c6..99d15d06a32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 25 18:20:37 2000 John Heitmann <jwh1@cs.wustl.edu> + + * include/makeinclude/wrapper_macros.GNU: + Changed pace=1 code to check for inline=1, and + include libPACE correctly. + Tue Jul 25 16:42:02 2000 Andrew G. Gilpin <agg1@cs.wustl.edu> * ace/Logging_Strategy.cpp: @@ -24,7 +30,7 @@ Tue Jul 25 13:30:00 2000 Kirthika Parameswaran <kirthika@cs.wustl.edu> Edan Ayal <edana@bandwiz.com> for contributing this class and Susan Liebeskind <shl@janis.gtri.gatech.edu> for brainstorming about it. - + Tue Jul 25 05:46:29 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Log_Msg.cpp (log): Optimized the check to make sure that diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 854d01783c6..99d15d06a32 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Tue Jul 25 18:20:37 2000 John Heitmann <jwh1@cs.wustl.edu> + + * include/makeinclude/wrapper_macros.GNU: + Changed pace=1 code to check for inline=1, and + include libPACE correctly. + Tue Jul 25 16:42:02 2000 Andrew G. Gilpin <agg1@cs.wustl.edu> * ace/Logging_Strategy.cpp: @@ -24,7 +30,7 @@ Tue Jul 25 13:30:00 2000 Kirthika Parameswaran <kirthika@cs.wustl.edu> Edan Ayal <edana@bandwiz.com> for contributing this class and Susan Liebeskind <shl@janis.gtri.gatech.edu> for brainstorming about it. - + Tue Jul 25 05:46:29 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Log_Msg.cpp (log): Optimized the check to make sure that diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 854d01783c6..99d15d06a32 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Tue Jul 25 18:20:37 2000 John Heitmann <jwh1@cs.wustl.edu> + + * include/makeinclude/wrapper_macros.GNU: + Changed pace=1 code to check for inline=1, and + include libPACE correctly. + Tue Jul 25 16:42:02 2000 Andrew G. Gilpin <agg1@cs.wustl.edu> * ace/Logging_Strategy.cpp: @@ -24,7 +30,7 @@ Tue Jul 25 13:30:00 2000 Kirthika Parameswaran <kirthika@cs.wustl.edu> Edan Ayal <edana@bandwiz.com> for contributing this class and Susan Liebeskind <shl@janis.gtri.gatech.edu> for brainstorming about it. - + Tue Jul 25 05:46:29 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> * ace/Log_Msg.cpp (log): Optimized the check to make sure that diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index c9264f7401f..d2707cb7971 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -438,7 +438,12 @@ ifeq ($(pace),0) endif # pace ifneq ($(pace),) - CFLAGS+= -DACE_HAS_PACE -DPACE_HAS_INLINE -DPACE_HAS_ALL_POSIX_FUNCS -I$(ACE_ROOT)/PACE +ifneq ($(inline),0) + CFLAGS+= -DPACE_HAS_INLINE=1 +endif + CFLAGS+= -DACE_HAS_PACE -DPACE_HAS_ALL_POSIX_FUNCS -I$(ACE_ROOT)/PACE + LDFLAGS+= -L$(ACE_ROOT)/PACE/pace/ + ACELIB=-lACE /project/danzon/john/ACE_wrappers/build/sun7g++/PACE/pace/libPACE.a include $(ACE_ROOT)/PACE/include/makeinclude/rules.common.GNU endif # pace |