summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/DsLogAdmin.bor')
-rw-r--r--TAO/orbsvcs/orbsvcs/DsLogAdmin.bor29
1 files changed, 11 insertions, 18 deletions
diff --git a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
index f8d12fc3763..970bd2292bb 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.bor
@@ -26,33 +26,26 @@ OBJFILES = \
RESOURCE = $(OBJDIR)\orbsvcs.res
-CFLAGS = \
- $(ACE_CFLAGS) \
- $(TAO_CFLAGS) \
- $(TAO_PORTABLESERVER_CFLAGS) \
- $(TAO_SVC_UTILS_CFLAGS) \
- $(TAO_TRADING_CFLAGS) \
- $(TAO_LOG_CFLAGS) \
- -DTAO_LOG_BUILD_DLL
+!ifdef STATIC
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_TRADING_CFLAGS) $(TAO_LOG_CFLAGS)
+!else
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SVC_UTILS_CFLAGS) \
+ $(TAO_TRADING_CFLAGS) $(TAO_LOG_CFLAGS) -DTAO_LOG_BUILD_DLL
+!endif
CPPDIR = .;Log
IDLDIR = .
-INCDIR_NAME = orbsvcs\Log
-INCLUDES = Log\*.h
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB) $(TAO_TRADING_LIB)
-LIBFILES = \
- $(ACE_LIB) \
- $(TAO_LIB) \
- $(TAO_PORTABLESERVER_LIB) \
- $(TAO_SVC_UTILS_LIB) \
- $(TAO_TRADING_LIB)
-
-all: idl_src_files
+all: idl_src_files log_lib
!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+log_lib: $(TARGET)
+
#
# IDL Build rules