diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-22 16:34:56 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-22 16:34:56 +0000 |
| commit | b5f164f90c2ea5997ac4cb09539536fde25422f3 (patch) | |
| tree | 608135c0138b01aab1eba23a6988732f210a85fa | |
| parent | 020e9d8b4187d0b2833bdfd9ee8ce604975f4b42 (diff) | |
| download | ATCD-b5f164f90c2ea5997ac4cb09539536fde25422f3.tar.gz | |
ChangeLogTag: Wed Jan 22 16:33:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTCORBAEvent | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent | 11 |
3 files changed, 31 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ff75245c6dc..aec65bde5e2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,10 +1,17 @@ +Wed Jan 22 16:34:32 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * Makefile.RTCORBAEvent: + * Makefile.RTSchedEvent: + Set the correct x_BUILD_DLL defines. These are needed for the + Cygwin/MingW and Kylix compiler. + Tue Jan 21 15:31:46 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/lex.yy.cpp: Modified code handling #pragma version directive to handle the case where one or more of the spaces between the words - in the directive contains a tab. Thanks to Dima Scub + in the directive contains a tab. Thanks to Dima Scub <dima_scub@sniip.ru> for reporting the bug. This closes [BUGID:1425]. @@ -13,7 +20,7 @@ Tue Jan 21 15:31:46 2003 Jeff Parsons <j.parsons@vanderbilt.edu> Changed the file that generates lex.yy.cpp to reflect the change above. -Tue Jan 21 19:28:12 UC 2003 Johnny Willemsen <jwillemsen@remedy.nl> +Tue Jan 21 19:28:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * Makefile.av: * Makefile.CosLoadBalancing: diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTCORBAEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTCORBAEvent index c01b91a5c39..95f16e06eeb 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTCORBAEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTCORBAEvent @@ -55,6 +55,17 @@ LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/orbsvcs/ESF +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_RTCORBAEVENT_BUILD_DLL +endif +endif +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS +endif +endif + # # Extra dependencies not caught by make depend. # diff --git a/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent b/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent index 5b3b0d79ccf..d05b49f9592 100644 --- a/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent +++ b/TAO/orbsvcs/orbsvcs/Makefile.RTSchedEvent @@ -61,6 +61,17 @@ LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/orbsvcs CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \ -I$(TAO_ROOT)/orbsvcs/orbsvcs/ESF +ifeq ($(shared_libs),1) +ifneq ($(SHLIB),) +CPPFLAGS += -DTAO_RTSCHEDEVENT_BUILD_DLL +endif +endif +ifeq ($(static_libs),1) +ifneq ($(LIB),) +CPPFLAGS += -DTAO_AS_STATIC_LIBS -DACE_AS_STATIC_LIBS +endif +endif + # # Extra dependencies not caught by make depend. # |