summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2003-01-19 15:04:36 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2003-01-19 15:04:36 +0000
commitd468504456be37a9c54a330b6816e014932f7c91 (patch)
tree25017e7f16c1407fef5a594dc30d195d88bcfa78
parent5ba2072e15acfe6fe07a3eb4a73662485c301857 (diff)
downloadATCD-d468504456be37a9c54a330b6816e014932f7c91.tar.gz
ChangeLogTag: Sun Jan 19 15:02:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ChangeLog10
-rw-r--r--ChangeLogs/ChangeLog-03a10
-rw-r--r--websvcs/lib/Makefile12
3 files changed, 28 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ea0e56cc92e..6bd4cea4cca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jan 19 15:03:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * websvcs/lib/Makefile:
+ Set the correct x_BUILD_DLL defines. These are needed for the
+ Cygwin/MingW and Kylix compiler.
+
Sat Jan 18 17:49:20 2003 Steve Huston <shuston@riverace.com>
* Makefile: Removed PACE references.
@@ -5,11 +11,11 @@ Sat Jan 18 17:49:20 2003 Steve Huston <shuston@riverace.com>
Sat Jan 18 17:11:21 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* bin/make_release: Use doxygen 1.2.18 as opposed to doxygen
- 1.2.13.1.
+ 1.2.13.1.
Fri Jan 17 09:00:17 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
- * ACE-INSTALL.html (make): Removed all claims that we support
+ * ACE-INSTALL.html (make): Removed all claims that we support
SunC++ 4.2. Thanks to Kirat Singh <kirat.singh@gs.com> for
reporting this.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index ea0e56cc92e..6bd4cea4cca 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Sun Jan 19 15:03:13 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * websvcs/lib/Makefile:
+ Set the correct x_BUILD_DLL defines. These are needed for the
+ Cygwin/MingW and Kylix compiler.
+
Sat Jan 18 17:49:20 2003 Steve Huston <shuston@riverace.com>
* Makefile: Removed PACE references.
@@ -5,11 +11,11 @@ Sat Jan 18 17:49:20 2003 Steve Huston <shuston@riverace.com>
Sat Jan 18 17:11:21 2003 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* bin/make_release: Use doxygen 1.2.18 as opposed to doxygen
- 1.2.13.1.
+ 1.2.13.1.
Fri Jan 17 09:00:17 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
- * ACE-INSTALL.html (make): Removed all claims that we support
+ * ACE-INSTALL.html (make): Removed all claims that we support
SunC++ 4.2. Thanks to Kirat Singh <kirat.singh@gs.com> for
reporting this.
diff --git a/websvcs/lib/Makefile b/websvcs/lib/Makefile
index 96b3096fb49..1ce33ee6fe1 100644
--- a/websvcs/lib/Makefile
+++ b/websvcs/lib/Makefile
@@ -36,6 +36,18 @@ $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT):
$(COMPILE-NO_DASH_G.cc) -o $@ $<
endif # SUPPRESS_DASH_G
+ifeq ($(shared_libs),1)
+ifneq ($(SHLIB),)
+CPPFLAGS += -DACE_WEBSVCS_BUILD_DLL
+endif
+endif
+
+ifeq ($(static_libs),1)
+ifneq ($(LIB),)
+CPPFLAGS += -DACE_AS_STATIC_LIBS
+endif
+endif
+
#----------------------------------------------------------------------------
# Dependencies
#----------------------------------------------------------------------------