summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2013-12-17 16:54:02 +0000
committerAlan Conway <aconway@apache.org>2013-12-17 16:54:02 +0000
commit6f9ddeea74d4b6c184a234f6e2e54e90fec5a514 (patch)
tree112539b9baa8a833928d7ea2cb4ad3ff47b9199f
parent73f1509720ce108bbda321460fba35d0691e3504 (diff)
downloadqpid-python-6f9ddeea74d4b6c184a234f6e2e54e90fec5a514.tar.gz
QPID-5255: Add missing licenses in qpid/cpp tree.
Added licenses to: qpid/cpp/src/qmf2.pc.in qpid/cpp/src/qpid.linkmap qpid/cpp/src/qpid.pc.in From trunk r1551620 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.26@1551622 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/qmf2.pc.in23
-rw-r--r--qpid/cpp/src/qpid.linkmap21
-rw-r--r--qpid/cpp/src/qpid.pc.in23
3 files changed, 63 insertions, 4 deletions
diff --git a/qpid/cpp/src/qmf2.pc.in b/qpid/cpp/src/qmf2.pc.in
index cbe01b3ee2..4c7e6f9763 100644
--- a/qpid/cpp/src/qmf2.pc.in
+++ b/qpid/cpp/src/qmf2.pc.in
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@@ -7,5 +26,5 @@ Name: qmf2
Version: @VERSION@
Description: Qpid Management Framework
Requires: qpid
-Libs: -L${libdir} -lqmf2 @LIBS@
-Cflags: -I${includedir}
+Libs: -L@libdir@ -lqmf2 @LIBS@
+Cflags: -I@includedir@
diff --git a/qpid/cpp/src/qpid.linkmap b/qpid/cpp/src/qpid.linkmap
index 4556985b1b..264e6bac57 100644
--- a/qpid/cpp/src/qpid.linkmap
+++ b/qpid/cpp/src/qpid.linkmap
@@ -1,3 +1,24 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ *
+ */
+
{
global:
extern "C++" {
diff --git a/qpid/cpp/src/qpid.pc.in b/qpid/cpp/src/qpid.pc.in
index 626b1ba9c0..c44a157347 100644
--- a/qpid/cpp/src/qpid.pc.in
+++ b/qpid/cpp/src/qpid.pc.in
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@@ -7,5 +26,5 @@ Name: qpid
Version: @VERSION@
Description: Qpid C++ client library
Requires:
-Libs: -L${libdir} -lqpidmessaging -lqpidtypes @LIBS@
-Cflags: -I${includedir}
+Libs: -L@libdir@ -lqpidmessaging -lqpidtypes @LIBS@
+Cflags: -I@includedir@