diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/demo/Ice/hello/config | 6 | ||||
| -rw-r--r-- | cpp/test/Ice/hold/Makefile | 19 |
2 files changed, 12 insertions, 13 deletions
diff --git a/cpp/demo/Ice/hello/config b/cpp/demo/Ice/hello/config index fe88a69d502..39c092f4770 100644 --- a/cpp/demo/Ice/hello/config +++ b/cpp/demo/Ice/hello/config @@ -2,14 +2,14 @@ # The client reads this property to create the reference to the # "hello" object in the server. # -Hello.Proxy=hello:tcp -p 10000#:udp -p 10000:ssl -p 10001 +Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001 # # The server creates one single object adapter with the name # "Hello". The following line sets the endpoints for this # adapter. # -Hello.Endpoints=tcp -p 10000#:udp -p 10000:ssl -p 10001 +Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001 # # Warn about connection exceptions @@ -55,7 +55,7 @@ IceSSL.Trace.Security=0 # An XML based file that specifies the certificates, keys, SSL version # and other pertinent information for creating an SSL connection. # -#Ice.Plugin.IceSSL=IceSSL:create +Ice.Plugin.IceSSL=IceSSL:create IceSSL.Client.CertPath=../../../certs IceSSL.Client.Config=sslconfig.xml IceSSL.Server.CertPath=../../../certs diff --git a/cpp/test/Ice/hold/Makefile b/cpp/test/Ice/hold/Makefile index f80b9cb91b4..c977df9e97e 100644 --- a/cpp/test/Ice/hold/Makefile +++ b/cpp/test/Ice/hold/Makefile @@ -14,16 +14,15 @@ SERVER = server TARGETS = $(CLIENT) $(SERVER) -OBJS = Test.o \ - -COBJS = Client.o \ +COBJS = Test.o \ + Client.o \ AllTests.o -SOBJS = TestI.o \ +SOBJS = Test.o \ + TestI.o \ Server.o -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ +SRCS = $(COBJS:.o=.cpp) \ $(SOBJS:.o=.cpp) SLICE_SRCS = Test.ice @@ -32,12 +31,12 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(CPPFLAGS) -$(CLIENT): $(OBJS) $(COBJS) +$(CLIENT): $(COBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(COBJS) $(LIBS) -$(SERVER): $(OBJS) $(SOBJS) +$(SERVER): $(SOBJS) rm -f $@ - $(CXX) $(LDFLAGS) -o $@ $(OBJS) $(SOBJS) $(LIBS) + $(CXX) $(LDFLAGS) -o $@ $(SOBJS) $(LIBS) include .depend |