diff options
Diffstat (limited to 'lib/orber/c_src')
| -rw-r--r-- | lib/orber/c_src/InitialReference.cc | 19 | ||||
| -rw-r--r-- | lib/orber/c_src/InitialReference.hh | 19 | ||||
| -rw-r--r-- | lib/orber/c_src/Makefile | 23 | ||||
| -rw-r--r-- | lib/orber/c_src/Makefile.in | 43 | ||||
| -rw-r--r-- | lib/orber/c_src/main.cc | 19 |
5 files changed, 57 insertions, 66 deletions
diff --git a/lib/orber/c_src/InitialReference.cc b/lib/orber/c_src/InitialReference.cc index a95fa0f599..053f3c9c8e 100644 --- a/lib/orber/c_src/InitialReference.cc +++ b/lib/orber/c_src/InitialReference.cc @@ -4,16 +4,17 @@ * <holder>Ericsson AB, All Rights Reserved</holder> *</copyright> *<legalnotice> - * The contents of this file are subject to the Erlang Public License, - * Version 1.1, (the "License"); you may not use this file except in - * compliance with the License. You should have received a copy of the - * Erlang Public License along with this software. If not, it can be - * retrieved online at http://www.erlang.org/. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and limitations - * under the License. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * The Initial Developer of the Original Code is Ericsson AB. *</legalnotice> diff --git a/lib/orber/c_src/InitialReference.hh b/lib/orber/c_src/InitialReference.hh index 1c3c5c8e0d..79725522db 100644 --- a/lib/orber/c_src/InitialReference.hh +++ b/lib/orber/c_src/InitialReference.hh @@ -4,16 +4,17 @@ * <holder>Ericsson AB, All Rights Reserved</holder> *</copyright> *<legalnotice> - * The contents of this file are subject to the Erlang Public License, - * Version 1.1, (the "License"); you may not use this file except in - * compliance with the License. You should have received a copy of the - * Erlang Public License along with this software. If not, it can be - * retrieved online at http://www.erlang.org/. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and limitations - * under the License. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * The Initial Developer of the Original Code is Ericsson AB. *</legalnotice> diff --git a/lib/orber/c_src/Makefile b/lib/orber/c_src/Makefile index 73ab79d145..bad1d3ddb0 100644 --- a/lib/orber/c_src/Makefile +++ b/lib/orber/c_src/Makefile @@ -1,18 +1,19 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2009. All Rights Reserved. +# Copyright Ericsson AB 1997-2016. All Rights Reserved. # -# The contents of this file are subject to the Erlang Public License, -# Version 1.1, (the "License"); you may not use this file except in -# compliance with the License. You should have received a copy of the -# Erlang Public License along with this software. If not, it can be -# retrieved online at http://www.erlang.org/. -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -# the License for the specific language governing rights and limitations -# under the License. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # diff --git a/lib/orber/c_src/Makefile.in b/lib/orber/c_src/Makefile.in index 3040c6443e..980e780451 100644 --- a/lib/orber/c_src/Makefile.in +++ b/lib/orber/c_src/Makefile.in @@ -1,18 +1,19 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2012. All Rights Reserved. +# Copyright Ericsson AB 1997-2016. All Rights Reserved. # -# The contents of this file are subject to the Erlang Public License, -# Version 1.1, (the "License"); you may not use this file except in -# compliance with the License. You should have received a copy of the -# Erlang Public License along with this software. If not, it can be -# retrieved online at http://www.erlang.org/. -# -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -# the License for the specific language governing rights and limitations -# under the License. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # @@ -56,16 +57,10 @@ debug opt: $(OBJDIR) orber ifeq ($(findstring win32,$(TARGET)),win32) orber: - echo "Nothing to build on NT" + $(V_colon)echo "Nothing to build on NT" else -ifeq ($(findstring vxworks,$(TARGET)),vxworks) orber: - echo "Nothing to build for VxWorks" - -else -orber: - echo "Nothing to build" -endif + $(V_colon)echo "Nothing to build" endif clean: @@ -80,7 +75,7 @@ $(OBJDIR): -mkdir -p $(OBJDIR) $(OBJDIR)/%.o: %.c - $(CC) -c -o $@ $(ALL_CFLAGS) $< + $(V_CC) -c -o $@ $(ALL_CFLAGS) $< # ---------------------------------------------------- # Release Target @@ -94,20 +89,12 @@ release_spec: opt $(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src" $(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include" else -ifeq ($(findstring vxworks,$(TARGET)),vxworks) -release_spec: - $(INSTALL_DIR) "$(RELSYSDIR)/priv/src" - $(INSTALL_DIR) "$(RELSYSDIR)/priv/include" - $(INSTALL_PROGRAM) $(CC_FILES) "$(RELSYSDIR)/priv/src" - $(INSTALL_PROGRAM) $(HH_FILES) "$(RELSYSDIR)/priv/include" -else release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/priv/src" $(INSTALL_DIR) "$(RELSYSDIR)/priv/include" $(INSTALL_DATA) $(CC_FILES) "$(RELSYSDIR)/priv/src" $(INSTALL_DATA) $(HH_FILES) "$(RELSYSDIR)/priv/include" endif -endif release_docs_spec: diff --git a/lib/orber/c_src/main.cc b/lib/orber/c_src/main.cc index c1d17078c5..109aaf824a 100644 --- a/lib/orber/c_src/main.cc +++ b/lib/orber/c_src/main.cc @@ -4,16 +4,17 @@ * <holder>Ericsson AB, All Rights Reserved</holder> *</copyright> *<legalnotice> - * The contents of this file are subject to the Erlang Public License, - * Version 1.1, (the "License"); you may not use this file except in - * compliance with the License. You should have received a copy of the - * Erlang Public License along with this software. If not, it can be - * retrieved online at http://www.erlang.org/. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and limitations - * under the License. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * The Initial Developer of the Original Code is Ericsson AB. *</legalnotice> |