diff options
Diffstat (limited to 'cpp/config')
-rw-r--r-- | cpp/config/Make.rules | 6 | ||||
-rw-r--r-- | cpp/config/Make.rules.AIX | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.Darwin | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.FreeBSD | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.HP-UX | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.Linux | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.MINGW | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.OSF1 | 2 | ||||
-rw-r--r-- | cpp/config/Make.rules.SunOS | 2 | ||||
-rwxr-xr-x | cpp/config/Make.rules.mak | 2 | ||||
-rwxr-xr-x | cpp/config/Make.rules.msvc | 2 | ||||
-rw-r--r-- | cpp/config/Makefile | 2 | ||||
-rw-r--r-- | cpp/config/Makefile.mak | 2 | ||||
-rwxr-xr-x | cpp/config/convertssl.py | 2 | ||||
-rw-r--r-- | cpp/config/findSliceFiles.py | 2 | ||||
-rw-r--r-- | cpp/config/ice_ca.cnf | 2 | ||||
-rwxr-xr-x | cpp/config/makegitignore.py | 2 | ||||
-rw-r--r-- | cpp/config/templates.xml | 2 | ||||
-rwxr-xr-x | cpp/config/upgradeicegrid33.py | 2 | ||||
-rwxr-xr-x | cpp/config/upgradeicegrid35.py | 2 |
20 files changed, 24 insertions, 20 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index db6eb9fb4cf..1bc2e49f0e8 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. @@ -329,6 +329,10 @@ ifeq ($(ICESSL_LIBS),) ICESSL_LIBS = -lIceSSL $(LIBS) endif +ifeq ($(ICEWS_LIBS),) + ICEWS_LIBS = -lIceWS $(LIBS) +endif + EVERYTHING = all depend clean install EVERYTHING_EXCEPT_ALL = depend clean install diff --git a/cpp/config/Make.rules.AIX b/cpp/config/Make.rules.AIX index 5182b065cac..e905165609c 100644 --- a/cpp/config/Make.rules.AIX +++ b/cpp/config/Make.rules.AIX @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index 10f0b9f0ce7..f9922b48927 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.FreeBSD b/cpp/config/Make.rules.FreeBSD index 57d830bc317..74086c1c895 100644 --- a/cpp/config/Make.rules.FreeBSD +++ b/cpp/config/Make.rules.FreeBSD @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX index a156e00dc57..456c2871b12 100644 --- a/cpp/config/Make.rules.HP-UX +++ b/cpp/config/Make.rules.HP-UX @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux index 5d5717c9f82..cc4c536b1d1 100644 --- a/cpp/config/Make.rules.Linux +++ b/cpp/config/Make.rules.Linux @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.MINGW b/cpp/config/Make.rules.MINGW index f5e56d41d9d..cad028a2d2c 100644 --- a/cpp/config/Make.rules.MINGW +++ b/cpp/config/Make.rules.MINGW @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.OSF1 b/cpp/config/Make.rules.OSF1 index 4080e182a66..a9db2bf73c5 100644 --- a/cpp/config/Make.rules.OSF1 +++ b/cpp/config/Make.rules.OSF1 @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index d6581b596ba..14345ca5f05 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index bc2e32c513d..efe32b8ef7e 100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc index 26737d5dd1a..dc53ec96b69 100755 --- a/cpp/config/Make.rules.msvc +++ b/cpp/config/Make.rules.msvc @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Makefile b/cpp/config/Makefile index 2dd6d4d86aa..68fa79d7b2f 100644 --- a/cpp/config/Makefile +++ b/cpp/config/Makefile @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/Makefile.mak b/cpp/config/Makefile.mak index fa49861c202..5c30b3943fc 100644 --- a/cpp/config/Makefile.mak +++ b/cpp/config/Makefile.mak @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/convertssl.py b/cpp/config/convertssl.py index 621022d20ec..0bc6ddb9f94 100755 --- a/cpp/config/convertssl.py +++ b/cpp/config/convertssl.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/findSliceFiles.py b/cpp/config/findSliceFiles.py index 6b61ff45b08..0f3d9bbf99c 100644 --- a/cpp/config/findSliceFiles.py +++ b/cpp/config/findSliceFiles.py @@ -2,7 +2,7 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/ice_ca.cnf b/cpp/config/ice_ca.cnf index 8d3c218408a..4d21c7b1132 100644 --- a/cpp/config/ice_ca.cnf +++ b/cpp/config/ice_ca.cnf @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/makegitignore.py b/cpp/config/makegitignore.py index cf5f8470890..88cb581f8bd 100755 --- a/cpp/config/makegitignore.py +++ b/cpp/config/makegitignore.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml index aa315a631e3..c968bc72ac3 100644 --- a/cpp/config/templates.xml +++ b/cpp/config/templates.xml @@ -1,7 +1,7 @@ <!-- ********************************************************************** - Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. + Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. This copy of Ice is licensed to you under the terms described in the ICE_LICENSE file included in this distribution. diff --git a/cpp/config/upgradeicegrid33.py b/cpp/config/upgradeicegrid33.py index ffb27a85a4d..cc56d47958b 100755 --- a/cpp/config/upgradeicegrid33.py +++ b/cpp/config/upgradeicegrid33.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. diff --git a/cpp/config/upgradeicegrid35.py b/cpp/config/upgradeicegrid35.py index f23cc013b05..547d888f0ed 100755 --- a/cpp/config/upgradeicegrid35.py +++ b/cpp/config/upgradeicegrid35.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. |