From d851f10a48500a348a134fab6f1a637bade12109 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 8 Feb 2018 16:05:33 -0800 Subject: [PATCH] GUACAMOLE-353: Clarify applicability of ASF header when transcluded into generated build files. --- Makefile.am | 6 ++++++ src/common-ssh/Makefile.am | 6 ++++++ src/common/Makefile.am | 6 ++++++ src/guacd/Makefile.am | 6 ++++++ src/guacenc/Makefile.am | 6 ++++++ src/guaclog/Makefile.am | 6 ++++++ src/libguac/Makefile.am | 6 ++++++ src/protocols/kubernetes/Makefile.am | 6 ++++++ src/protocols/rdp/Makefile.am | 6 ++++++ src/protocols/ssh/Makefile.am | 6 ++++++ src/protocols/telnet/Makefile.am | 6 ++++++ src/protocols/vnc/Makefile.am | 6 ++++++ src/pulse/Makefile.am | 6 ++++++ src/terminal/Makefile.am | 6 ++++++ tests/Makefile.am | 6 ++++++ 15 files changed, 90 insertions(+) diff --git a/Makefile.am b/Makefile.am index 63bd8e08..6926474b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# ACLOCAL_AMFLAGS = -I m4 diff --git a/src/common-ssh/Makefile.am b/src/common-ssh/Makefile.am index b839ab00..81167238 100644 --- a/src/common-ssh/Makefile.am +++ b/src/common-ssh/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 32d12836..06190103 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/guacd/Makefile.am b/src/guacd/Makefile.am index 4dcd3d22..356f72f2 100644 --- a/src/guacd/Makefile.am +++ b/src/guacd/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign diff --git a/src/guacenc/Makefile.am b/src/guacenc/Makefile.am index a505ff5b..8debd632 100644 --- a/src/guacenc/Makefile.am +++ b/src/guacenc/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign diff --git a/src/guaclog/Makefile.am b/src/guaclog/Makefile.am index 6acced30..af5c5a76 100644 --- a/src/guaclog/Makefile.am +++ b/src/guaclog/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign diff --git a/src/libguac/Makefile.am b/src/libguac/Makefile.am index 5123121d..d541df58 100644 --- a/src/libguac/Makefile.am +++ b/src/libguac/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/protocols/kubernetes/Makefile.am b/src/protocols/kubernetes/Makefile.am index 56db4d64..b100c176 100644 --- a/src/protocols/kubernetes/Makefile.am +++ b/src/protocols/kubernetes/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index cffabb2c..670359fc 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/protocols/ssh/Makefile.am b/src/protocols/ssh/Makefile.am index 87d4a728..d60cf002 100644 --- a/src/protocols/ssh/Makefile.am +++ b/src/protocols/ssh/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/protocols/telnet/Makefile.am b/src/protocols/telnet/Makefile.am index a44118de..bec0e955 100644 --- a/src/protocols/telnet/Makefile.am +++ b/src/protocols/telnet/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am index 0c5ea478..fcba33f1 100644 --- a/src/protocols/vnc/Makefile.am +++ b/src/protocols/vnc/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/pulse/Makefile.am b/src/pulse/Makefile.am index b7921245..3cb2d44c 100644 --- a/src/pulse/Makefile.am +++ b/src/pulse/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am index 1a609324..9fce9dc5 100644 --- a/src/terminal/Makefile.am +++ b/src/terminal/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 diff --git a/tests/Makefile.am b/tests/Makefile.am index 7c7e07bc..fc1302e5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,6 +16,12 @@ # specific language governing permissions and limitations # under the License. # +# NOTE: Parts of this file (Makefile.am) are automatically transcluded verbatim +# into Makefile.in. Though the build system (GNU Autotools) automatically adds +# its own license boilerplate to the generated Makefile.in, that boilerplate +# does not apply to the transcluded portions of Makefile.am which are licensed +# to you by the ASF under the Apache License, Version 2.0, as described above. +# AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4