summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/demo/Glacier/session/Makefile9
-rw-r--r--cpp/src/FreezeScript/Makefile4
-rw-r--r--cpp/src/Glacier/Makefile11
-rw-r--r--cpp/src/IcePack/Makefile18
-rw-r--r--cpp/src/IcePatch/Makefile13
-rw-r--r--cpp/src/IceStorm/Makefile2
-rw-r--r--cpp/test/Glacier/starter/Makefile9
-rw-r--r--cpp/test/IceSSL/certificateAndKeyParsing/Makefile9
-rw-r--r--cpp/test/IceSSL/certificateVerification/Makefile11
-rw-r--r--cpp/test/IceSSL/certificateVerifier/Makefile9
-rw-r--r--cpp/test/IceSSL/configuration/Makefile9
-rw-r--r--cpp/test/IceSSL/loadPEM/Makefile9
12 files changed, 82 insertions, 31 deletions
diff --git a/cpp/demo/Glacier/session/Makefile b/cpp/demo/Glacier/session/Makefile
index b159e5b6675..059ce8c0a08 100644
--- a/cpp/demo/Glacier/session/Makefile
+++ b/cpp/demo/Glacier/session/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
@@ -33,7 +38,7 @@ CPPFLAGS := -I. $(CPPFLAGS)
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier -lIceSSL $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
$(SERVER): $(OBJS) $(SOBJS)
rm -f $@
diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile
index 1c3f611d15b..05bfbbcfb74 100644
--- a/cpp/src/FreezeScript/Makefile
+++ b/cpp/src/FreezeScript/Makefile
@@ -44,11 +44,11 @@ BISONFLAGS := --name-prefix "freeze_script_" $(BISONFLAGS)
$(TRANSFORMDB): $(TRANSFORM_OBJS) $(COMMON_OBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) $(COMMON_OBJS) -lSlice -lIceXML $(LIBS) $(DB_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(TRANSFORM_OBJS) $(COMMON_OBJS) -lSlice -lIceXML $(LIBS) $(DB_LIBS) $(EXPAT_LIBS)
$(DUMPDB): $(DUMP_OBJS) $(COMMON_OBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice -lIceXML $(LIBS) $(DB_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(DUMP_OBJS) $(COMMON_OBJS) -lSlice -lIceXML $(LIBS) $(DB_LIBS) $(EXPAT_LIBS)
clean::
rm -f Grammar.cpp Grammar.h
diff --git a/cpp/src/Glacier/Makefile b/cpp/src/Glacier/Makefile
index c7c52472b2f..7f621304e96 100644
--- a/cpp/src/Glacier/Makefile
+++ b/cpp/src/Glacier/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,Glacier,$(VERSION))
@@ -70,11 +75,11 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
$(ROUTER): $(ROBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(ROBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(ROBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
$(STARTER): $(SOBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier -lIceSSL $(OPENSSL_LIBS) $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(SOBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
install:: all
$(INSTALL_LIBRARY) $(libdir)/$(LIBFILENAME) $(install_libdir)
diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile
index c83c58b5934..b7385aa21ba 100644
--- a/cpp/src/IcePack/Makefile
+++ b/cpp/src/IcePack/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IcePack,$(VERSION))
@@ -117,11 +122,12 @@ $(ADMIN): $(ADMIN_OBJS) $(libdir)/$(LIBNAME)
$(REGISTRY_SERVER): $(REGISTRY_SVR_OBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(REGISTRY_SVR_OBJS) -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS) \
+ $(EXPAT_LIBS)
$(NODE_SERVER): $(NODE_SVR_OBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(NODE_SVR_OBJS) -lIcePack -lIceBox -lFreeze -lIceXML $(LIBS) $(DB_LIBS) $(EXPAT_LIBS)
$(LOCAL_HDIR)/%.h %.cpp: $(SDIR)/%.ice $(SLICE2CPP)
rm -f $(HDIR)/$(*F).h $(*F).cpp
@@ -152,11 +158,11 @@ clean::
rm -f StringObjectProxySeqDict.h StringObjectProxySeqDict.cpp
# Needed for make -jn to work.
-../IcePack/Grammar.y: Grammar.h
+#../IcePack/Grammar.y: Grammar.h
clean::
- rm -f Grammar.cpp Grammar.h
- rm -f Scanner.cpp
+# rm -f Grammar.cpp Grammar.h
+# rm -f Scanner.cpp
install:: all
$(INSTALL_LIBRARY) $(libdir)/$(LIBFILENAME) $(install_libdir)
diff --git a/cpp/src/IcePatch/Makefile b/cpp/src/IcePatch/Makefile
index 534d6cfb1d3..a6c63e3d1e5 100644
--- a/cpp/src/IcePatch/Makefile
+++ b/cpp/src/IcePatch/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../..
LIBFILENAME = $(call mklibfilename,IcePatch,$(VERSION))
@@ -64,15 +69,15 @@ $(libdir)/$(LIBNAME): $(libdir)/$(SONAME)
$(CLIENT): $(CLIENT_OBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(CLIENT_OBJS) -lIcePatch -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(CLIENT_OBJS) -lIcePatch -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
$(CALC): $(CALC_OBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(CALC_OBJS) -lIcePatch $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(CALC_OBJS) -lIcePatch $(LIBS) $(OPENSSL_LIBS)
$(SERVER): $(SERVER_OBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(SERVER_OBJS) -lIcePatch $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(SERVER_OBJS) -lIcePatch $(LIBS) $(OPENSSL_LIBS)
install:: all
$(INSTALL_LIBRARY) $(libdir)/$(LIBFILENAME) $(install_libdir)
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 2233924f2fa..71007a3f262 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -99,7 +99,7 @@ $(libdir)/$(SVCLIBNAME): $(libdir)/$(SVCSONAME)
$(ADMIN): $(AOBJS) $(libdir)/$(LIBNAME)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(AOBJS) -lIceStorm -lIceXML $(READLINE_LIBS) $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(AOBJS) -lIceStorm -lIceXML $(READLINE_LIBS) $(LIBS) $(EXPAT_LIBS)
PersistentTopicMap.h PersistentTopicMap.cpp: ../IceStorm/LinkRecord.ice $(slicedir)/Ice/Identity.ice $(SLICE2FREEZE)
rm -f PersistentTopicMap.h PersistentTopicMap.cpp
diff --git a/cpp/test/Glacier/starter/Makefile b/cpp/test/Glacier/starter/Makefile
index 635d3b4f549..38bb1809a25 100644
--- a/cpp/test/Glacier/starter/Makefile
+++ b/cpp/test/Glacier/starter/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
@@ -33,7 +38,7 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS)
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lGlacier -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
$(SERVER): $(OBJS) $(SOBJS)
rm -f $@
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
index 40fadf39333..607373adf0f 100644
--- a/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = certificateAndKeyParsing
@@ -23,6 +28,6 @@ CPPFLAGS := -I. -I../../include $(OPENSSL_FLAGS) $(CPPFLAGS)
$(CLIENT): $(OBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
include .depend
diff --git a/cpp/test/IceSSL/certificateVerification/Makefile b/cpp/test/IceSSL/certificateVerification/Makefile
index e558ada2de5..69d1c84bbc7 100644
--- a/cpp/test/IceSSL/certificateVerification/Makefile
+++ b/cpp/test/IceSSL/certificateVerification/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = client
@@ -32,10 +37,10 @@ CPPFLAGS := -I. -I../../include $(OPENSSL_FLAGS) $(CPPFLAGS)
$(CLIENT): $(OBJS) $(COBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIceSSL $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
$(SERVER): $(OBJS) $(SOBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
include .depend
diff --git a/cpp/test/IceSSL/certificateVerifier/Makefile b/cpp/test/IceSSL/certificateVerifier/Makefile
index 405d4600baa..0a82c9a76bc 100644
--- a/cpp/test/IceSSL/certificateVerifier/Makefile
+++ b/cpp/test/IceSSL/certificateVerifier/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = certificateVerifier
@@ -23,6 +28,6 @@ CPPFLAGS := -I. -I../../include $(OPENSSL_FLAGS) $(CPPFLAGS)
$(CLIENT): $(OBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
include .depend
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index e36a881b098..089ce882e46 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = configuration
@@ -23,6 +28,6 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS)
$(CLIENT): $(OBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
include .depend
diff --git a/cpp/test/IceSSL/loadPEM/Makefile b/cpp/test/IceSSL/loadPEM/Makefile
index 9165ca6c55a..5affda2367a 100644
--- a/cpp/test/IceSSL/loadPEM/Makefile
+++ b/cpp/test/IceSSL/loadPEM/Makefile
@@ -1,12 +1,17 @@
# **********************************************************************
#
-# Copyright (c) 2003-2004 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003 - 2004
+# ZeroC, Inc.
+# North Palm Beach, FL, USA
+#
+# All Rights Reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
#
# **********************************************************************
+
top_srcdir = ../../..
CLIENT = loadPEM
@@ -23,6 +28,6 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS)
$(CLIENT): $(OBJS)
rm -f $@
- $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS)
+ $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lIceSSL $(LIBS) $(OPENSSL_LIBS) $(EXPAT_LIBS)
include .depend
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 21:25:09 +0000