summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2000-10-13 11:44:04 +0000
committerbala <balanatarajan@users.noreply.github.com>2000-10-13 11:44:04 +0000
commit564c7e360aa27296b10741497edffb3bf8d784a6 (patch)
tree471ad765d7f04eb28075688fdeabc4100de73b99 /include
parent5e935d646266563901399f903a61062f6a984eb6 (diff)
downloadATCD-564c7e360aa27296b10741497edffb3bf8d784a6.tar.gz
ChangeLogTag: Fri Oct 13 06:26:18 2000 Balachandran Natarajan <bala@cs.wustl.edu>
Diffstat (limited to 'include')
-rw-r--r--include/makeinclude/ace_flags.bor38
-rw-r--r--include/makeinclude/build_dll.bor16
-rw-r--r--include/makeinclude/build_exe.bor16
-rw-r--r--include/makeinclude/build_lib.bor14
4 files changed, 42 insertions, 42 deletions
diff --git a/include/makeinclude/ace_flags.bor b/include/makeinclude/ace_flags.bor
index d8428ada762..ad87d713bbd 100644
--- a/include/makeinclude/ace_flags.bor
+++ b/include/makeinclude/ace_flags.bor
@@ -1,5 +1,5 @@
#
-# Flags specific for compiling ACE library and applications
+# Flags specific for compiling ACE library and applications
# with Borland C++Builder
#
@@ -21,45 +21,45 @@ SSL_CFLAGS = -I$(SSL_ROOT)\inc32 -DACE_HAS_SSL=1
ACE_SSL_CFLAGS = -I$(ACE_ROOT) -DACE_SSL_HAS_DLL=$(DLL_FLAG)
ACE_RMCAST_CFLAGS = -I$(ACE_ROOT) -DACE_RMCAST_HAS_DLL=$(DLL_FLAG)
TAO_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_HAS_DLL=$(DLL_FLAG)
-TAO_DYNAMICANY_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_DYNAMICANY_HAS_DLL=$(DLL_FLAG)
+TAO_DYNAMICANY_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_DYNAMICANY_HAS_DLL=$(DLL_FLAG)
TAO_PORTABLESERVER_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_PORTABLESERVER_HAS_DLL=$(DLL_FLAG)
-TAO_IORMANIP_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IORMANIP_HAS_DLL=$(DLL_FLAG)
-TAO_IORTABLE_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IORTABLE_HAS_DLL=$(DLL_FLAG)
+TAO_IORMANIP_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IORMANIP_HAS_DLL=$(DLL_FLAG)
+TAO_IORTABLE_CFLAGS = -I$(ACE_ROOT)\TAO -DTAO_IORTABLE_HAS_DLL=$(DLL_FLAG)
TAO_IDL_BE_CFLAGS = -I$(ACE_ROOT)\TAO\TAO_IDL -I$(ACE_ROOT)\TAO\TAO_IDL\be_include \
-DTAO_IDL_BE_HAS_DLL=$(DLL_FLAG)
TAO_IDL_FE_CFLAGS = -I$(ACE_ROOT)\TAO\TAO_IDL -I$(ACE_ROOT)\TAO\TAO_IDL\fe \
-I$(ACE_ROOT)\TAO\TAO_IDL\include -I$(ACE_ROOT)\TAO\TAO_IDL\util -DTAO_IDL_FE_HAS_DLL=$(DLL_FLAG)
TAO_SVC_UTILS_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SVC_UTILS_HAS_DLL=$(DLL_FLAG)
-TAO_AV_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_AV_HAS_DLL=$(DLL_FLAG)
+TAO_AV_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_AV_HAS_DLL=$(DLL_FLAG)
TAO_CONCURRENCY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_CONCURRENCY_HAS_DLL=$(DLL_FLAG)
TAO_EVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_EVENT_HAS_DLL=$(DLL_FLAG)
-TAO_FT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_FT_HAS_DLL=$(DLL_FLAG)
+TAO_FT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_FT_HAS_DLL=$(DLL_FLAG)
TAO_LIFECYCLE_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LIFECYCLE_HAS_DLL=$(DLL_FLAG)
TAO_LOADBALANCING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LOADBALANCING_HAS_DLL=$(DLL_FLAG)
TAO_LOG_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_LOG_HAS_DLL=$(DLL_FLAG)
TAO_NAMING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NAMING_HAS_DLL=$(DLL_FLAG)
TAO_NOTIFY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_NOTIFY_HAS_DLL=$(DLL_FLAG)
-TAO_PROPERTY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_PROPERTY_HAS_DLL=$(DLL_FLAG)
+TAO_PROPERTY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_PROPERTY_HAS_DLL=$(DLL_FLAG)
TAO_RTEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTEVENT_HAS_DLL=$(DLL_FLAG)
-TAO_RTOLDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTOLDEVENT_HAS_DLL=$(DLL_FLAG)
+TAO_RTOLDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTOLDEVENT_HAS_DLL=$(DLL_FLAG)
TAO_RTSCHED_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHED_HAS_DLL=$(DLL_FLAG)
-TAO_RTSCHEDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHEDEVENT_HAS_DLL=$(DLL_FLAG)
-TAO_SECURITY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SECURITY_HAS_DLL=$(DLL_FLAG)
+TAO_RTSCHEDEVENT_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_RTSCHEDEVENT_HAS_DLL=$(DLL_FLAG)
+TAO_SECURITY_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SECURITY_HAS_DLL=$(DLL_FLAG)
TAO_SSLIOP_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_SSLIOP_HAS_DLL=$(DLL_FLAG)
-TAO_TIME_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TIME_HAS_DLL=$(DLL_FLAG)
+TAO_TIME_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TIME_HAS_DLL=$(DLL_FLAG)
TAO_TRADING_CFLAGS = -I$(ACE_ROOT)\TAO\orbsvcs -DTAO_TRADING_HAS_DLL=$(DLL_FLAG)
#
# Libraries
#
-ACE_LIB = $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib
+ACE_LIB = $(CORE_BINDIR)\ace$(LIB_DECORATOR).lib
!ifdef SSL_ROOT
-SSL_LIB = $(SSL_ROOT)\out32$(DLL_NAME)\libeay32.lib $(SSL_ROOT)\out32$(DLL_NAME)\ssleay32.lib
+SSL_LIB = $(SSL_ROOT)\out32$(DLL_NAME)\libeay32.lib $(SSL_ROOT)\out32$(DLL_NAME)\ssleay32.lib
!endif
ACE_SSL_LIB = $(CORE_BINDIR)\ACE_SSL$(LIB_DECORATOR).lib
NETSVCS_LIB = $(CORE_BINDIR)\netsvcs$(LIB_DECORATOR).lib
ACE_RMCAST_LIB = $(CORE_BINDIR)\ACE_RMCast$(LIB_DECORATOR).lib
-TAO_LIB = $(CORE_BINDIR)\TAO$(LIB_DECORATOR).lib
+TAO_LIB = $(CORE_BINDIR)\TAO$(LIB_DECORATOR).lib
TAO_DYNAMICANY_LIB = $(CORE_BINDIR)\TAO_DynamicAny$(LIB_DECORATOR).lib
TAO_PORTABLESERVER_LIB = $(CORE_BINDIR)\TAO_PortableServer$(LIB_DECORATOR).lib
TAO_IORMANIP_LIB = $(CORE_BINDIR)\TAO_IORManip$(LIB_DECORATOR).lib
@@ -69,19 +69,19 @@ TAO_IDL_FE_LIB = $(CORE_BINDIR)\TAO_IDL_FE$(LIB_DECORATOR).lib
TAO_SVC_UTILS_LIB = $(CORE_BINDIR)\TAO_Svc_Utils$(LIB_DECORATOR).lib
TAO_AV_LIB = $(CORE_BINDIR)\TAO_AV$(LIB_DECORATOR).lib
TAO_CONCURRENCY_LIB = $(CORE_BINDIR)\TAO_CosConcurrency$(LIB_DECORATOR).lib
-TAO_EVENT_LIB = $(CORE_BINDIR)\TAO_CosEvent$(LIB_DECORATOR).lib
+TAO_EVENT_LIB = $(CORE_BINDIR)\TAO_CosEvent$(LIB_DECORATOR).lib
TAO_FT_LIB = $(CORE_BINDIR)\TAO_FaultTolerance$(LIB_DECORATOR).lib
TAO_LIFECYCLE_LIB = $(CORE_BINDIR)\TAO_CosLifeCycle$(LIB_DECORATOR).lib
-TAO_LOADBALANCING_LIB = $(CORE_BINDIR)\TAO_LoadBalancing$(LIB_DECORATOR).lib
+TAO_LOADBALANCING_LIB = $(CORE_BINDIR)\TAO_LoadBalancing$(LIB_DECORATOR).lib
TAO_LOG_LIB = $(CORE_BINDIR)\TAO_DsLogAdmin$(LIB_DECORATOR).lib
TAO_NAMING_LIB = $(CORE_BINDIR)\TAO_CosNaming$(LIB_DECORATOR).lib
TAO_NOTIFY_LIB = $(CORE_BINDIR)\TAO_CosNotification$(LIB_DECORATOR).lib
TAO_PROPERTY_LIB = $(CORE_BINDIR)\TAO_CosProperty$(LIB_DECORATOR).lib
-TAO_RTEVENT_LIB = $(CORE_BINDIR)\TAO_RTEvent$(LIB_DECORATOR).lib
+TAO_RTEVENT_LIB = $(CORE_BINDIR)\TAO_RTEvent$(LIB_DECORATOR).lib
TAO_RTOLDEVENT_LIB = $(CORE_BINDIR)\TAO_RTOLDEvent$(LIB_DECORATOR).lib
-TAO_RTSCHED_LIB = $(CORE_BINDIR)\TAO_RTSched$(LIB_DECORATOR).lib
+TAO_RTSCHED_LIB = $(CORE_BINDIR)\TAO_RTSched$(LIB_DECORATOR).lib
TAO_RTSCHEDEVENT_LIB = $(CORE_BINDIR)\TAO_RTSchedEvent$(LIB_DECORATOR).lib
TAO_SECURITY_LIB = $(CORE_BINDIR)\TAO_Security$(LIB_DECORATOR).lib
TAO_SSLIOP_LIB = $(CORE_BINDIR)\TAO_SSLIOP$(LIB_DECORATOR).lib
TAO_TIME_LIB = $(CORE_BINDIR)\TAO_CosTime$(LIB_DECORATOR).lib
-TAO_TRADING_LIB = $(CORE_BINDIR)\TAO_CosTrading$(LIB_DECORATOR).lib
+TAO_TRADING_LIB = $(CORE_BINDIR)\TAO_CosTrading$(LIB_DECORATOR).lib
diff --git a/include/makeinclude/build_dll.bor b/include/makeinclude/build_dll.bor
index d6dec039d81..ed69fb84917 100644
--- a/include/makeinclude/build_dll.bor
+++ b/include/makeinclude/build_dll.bor
@@ -1,15 +1,15 @@
#
-# Rules for linking a dll
+# Rules for linking a dll
#
# Inputs:
# ~~~~~~~
# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# CPPDIR - list of directories containing source files
+# CFLAGS - extra compiler flags for building target
+# CPPDIR - list of directories containing source files
# OBJFILES - list of (non-system) object files
# LIBFILES - list of (non-system) libraries
# PASCAL - if defined means link dll against pascal run-time library
-# DEBUG - if defined means building with debug information
+# DEBUG - if defined means building with debug information
#
!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
@@ -24,18 +24,18 @@ $(TARGET): $(OBJFILES) $(RESOURCE)
@$(MAKE_BINDIR)
$(LD) @&&!
$(COMMON_LFLAGS) $(DLL_LFLAGS) $(LFLAGS) +
- $(DLL_STARTUP_OBJ) $(OBJFILES), +
+ $(DLL_STARTUP_OBJ) $(OBJFILES), +
$(TARGET),, +
$(COMMON_LIBS) $(LIBFILES),, +
$(RESOURCE)
!
-!ifndef DEBUG
+!ifndef DEBUG
@del $(TARGET:.dll=.tds)
!endif
!include <$(ACE_ROOT)\include\makeinclude\clean.bor>
-INSTALL_TYPES = dll lib includes
+INSTALL_TYPES = dll lib includes
!include <$(ACE_ROOT)\include\makeinclude\install.bor>
@@ -44,7 +44,7 @@ INSTALL_TYPES = dll lib includes
!endif
!ifdef CDIR
-.path.c = $(CDIR)
+.path.c = $(CDIR)
!endif
!ifdef RESDIR
diff --git a/include/makeinclude/build_exe.bor b/include/makeinclude/build_exe.bor
index 85a9305e1fe..f3153a2476f 100644
--- a/include/makeinclude/build_exe.bor
+++ b/include/makeinclude/build_exe.bor
@@ -1,16 +1,16 @@
#
-# Rules for building an executable
+# Rules for building an executable
#
# Inputs:
# ~~~~~~~
# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# CPPDIR - list of directories containing source files
+# CFLAGS - extra compiler flags for building target
+# CPPDIR - list of directories containing source files
# OBJFILES - list of (non-system) object files
# LIBFILES - list of (non-system) libraries
# STATIC - if defined means link exe with static libraries
# PASCAL - if defined means link dll against pascal run-time library
-# DEBUG - if defined means building with debug information
+# DEBUG - if defined means building with debug information
#
!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
@@ -25,18 +25,18 @@ $(TARGET): $(OBJFILES) $(RESOURCE)
@$(MAKE_BINDIR)
$(LD) @&&!
$(COMMON_LFLAGS) $(EXE_LFLAGS) $(LFLAGS) +
- $(EXE_STARTUP_OBJ) $(OBJFILES), +
+ $(EXE_STARTUP_OBJ) $(OBJFILES), +
$(TARGET),, +
$(COMMON_LIBS) $(LIBFILES),, +
$(RESOURCE)
!
-!ifndef DEBUG
+!ifndef DEBUG
@del $(TARGET:.exe=.tds)
!endif
!include <$(ACE_ROOT)\include\makeinclude\clean.bor>
-INSTALL_TYPES = exe
+INSTALL_TYPES = exe
!include <$(ACE_ROOT)\include\makeinclude\install.bor>
@@ -45,7 +45,7 @@ INSTALL_TYPES = exe
!endif
!ifdef CDIR
-.path.c = $(CDIR)
+.path.c = $(CDIR)
!endif
!ifdef RESDIR
diff --git a/include/makeinclude/build_lib.bor b/include/makeinclude/build_lib.bor
index e28102f0dcd..73c09fa9218 100644
--- a/include/makeinclude/build_lib.bor
+++ b/include/makeinclude/build_lib.bor
@@ -1,15 +1,15 @@
#
-# Rules for building a static library
+# Rules for building a static library
#
# Inputs:
# ~~~~~~~
# NAME - undecorated name of target
-# CFLAGS - extra compiler flags for building target
-# CPPDIR - list of directories containing source files
+# CFLAGS - extra compiler flags for building target
+# CPPDIR - list of directories containing source files
# OBJFILES - list of (non-system) object files
# LIBFILES - list of (non-system) libraries
# PASCAL - if defined means link dll against pascal run-time library
-# DEBUG - if defined means building with debug information
+# DEBUG - if defined means building with debug information
#
!include <$(ACE_ROOT)\include\makeinclude\decorator.bor>
@@ -23,13 +23,13 @@ all: $(TARGET)
$(TARGET): $(OBJFILES)
@$(MAKE_BINDIR)
$(AR) $(LIB_LFLAGS) $(TARGET) @&&!
- +-$(**: = &^
+ +-$(**: = &^
+-)
!
!include <$(ACE_ROOT)\include\makeinclude\clean.bor>
-INSTALL_TYPES = lib includes
+INSTALL_TYPES = lib includes
!include <$(ACE_ROOT)\include\makeinclude\install.bor>
@@ -38,7 +38,7 @@ INSTALL_TYPES = lib includes
!endif
!ifdef CDIR
-.path.c = $(CDIR)
+.path.c = $(CDIR)
!endif
.path.obj = $(OBJDIR)