Add a COPYING file to each aux. source directory

Include a COPYING inside perf/, test/, util/ to clarify the licensing conditions beneath the respective directories. This is because cairo itself (libcairo.so) is LGPL-2.1/MPL-1.1 but that only relates to src/. The auxiliary source files are under a mix of free licenses and we wish to be clear just what license applies to each file. In particular, cairo-trace needs to include the GPL terms and conditions.
git-mirror · Oct 31, 2008 · ab8a0bf · ab8a0bf
1 parent c554f18
commit ab8a0bf
Show file tree

Hide file tree

Showing 10 changed files with 709 additions and 11 deletions.
diff --git a/COPYING b/COPYING
@@ -17,16 +17,17 @@ Please see each file in the implementation for copyright and licensing
 information, (in the opening comment of each file).
 
 [*] The implementation of cairo is contained entirely within the "src"
-and "pixman" directories of the cairo source distribution. There are
-other components of the cairo source distribution (such as the "test"
-and "perf") that are auxiliary to the library itself. None of the
-source code in these directories contributes to a build of the cairo
-library itself, (libcairo.so or cairo.dll or similar).
+directory of the cairo source distribution. There are other components
+of the cairo source distribution (such as the "test", "util", and "perf")
+that are auxiliary to the library itself. None of the source code in these
+directories contributes to a build of the cairo library itself, (libcairo.so
+or cairo.dll or similar).
 
-These auxilary components are also free software, but may be under
+These auxiliary components are also free software, but may be under
 different license terms than cairo itself. For example, most of the
 test cases in the perf and test directories are made available under
 an MIT license to simplify any use of this code for reference purposes
 in using cairo itself. Other files might be available under the GNU
-General Public License (GPL), for example. Again, please see the
-opening comment of each file for copyright and licensing information.
+General Public License (GPL), for example. Again, please see the COPYING
+file under each directory and the opening comment of each file for copyright
+and licensing information.
diff --git a/perf/COPYING b/perf/COPYING
@@ -0,0 +1,5 @@
+Cairo is free software.
+
+These tests are mainly available under a liberal MIT license to simplify
+any use of the code for reference purposes. Please check the opening comment
+of each file for copyright and licensing information.
diff --git a/perf/Makefile.am b/perf/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS =					\
 	$(CAIRO_CFLAGS)
 
 EXTRA_PROGRAMS += cairo-perf cairo-perf-diff-files cairo-perf-graph-files
-EXTRA_DIST += cairo-perf-diff
+EXTRA_DIST += cairo-perf-diff COPYING
 EXTRA_LTLIBRARIES += libcairoperf.la
 
 LDADD = $(top_builddir)/boilerplate/libcairoboilerplate.la \

diff --git a/test/COPYING b/test/COPYING
@@ -0,0 +1,5 @@
+Cairo is free software.
+
+These tests are mainly available under a liberal MIT license to simplify
+any use of the code for reference purposes. Please check the opening comment
+of each file for copyright and licensing information.
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -287,7 +287,7 @@ endif
 
 BUILT_SOURCES += cairo-test-constructors.c
 noinst_SCRIPTS = make-cairo-test-constructors.pl
-EXTRA_DIST += $(BUILT_SOURCES) $(noinst_SCRIPTS)
+EXTRA_DIST += $(BUILT_SOURCES) $(noinst_SCRIPTS) COPYING
 CLEANFILES += $(BUILT_SOURCES)
 
 # All tests which have a reference image go here.

diff --git a/util/COPYING b/util/COPYING
@@ -0,0 +1,4 @@
+Cairo is free software.
+
+These utilities are all free software, please see the licensing conditions
+in the opening comments of each file.
diff --git a/util/Makefile.am b/util/Makefile.am
@@ -25,5 +25,6 @@ backtrace_symbols_la_LIBADD  = -lbfd -liberty
 malloc_stats_la_LIBADD  = $(backtrace_symbols_la_LIBADD) backtrace-symbols.lo
 
 EXTRA_DIST += \
+	COPYING \
 	xr2cairo \
 	cairo-api-update
diff --git a/util/cairo-trace/COPYING b/util/cairo-trace/COPYING
@@ -0,0 +1,5 @@
+Cairo is free software.
+
+cairo-trace is released under the terms of the GNU General Public License
+(GPL) version 3. Please see COPYING-GPL-3 for the precise terms and
+conditions.
diff --git a/util/cairo-trace/COPYING-GPL-3 b/util/cairo-trace/COPYING-GPL-3
diff --git a/util/cairo-trace/Makefile.am b/util/cairo-trace/Makefile.am
@@ -18,4 +18,7 @@ system-install:
 system-uninstall:
 	sed -e '/\/usr\/local\/lib\/cairo-trace.so/d' < /etc/ld.so.preload > /tmp/ld.so.preload && mv /tmp/ld.so.preload /etc/ld.so.preload;
 
-EXTRA_DIST = cairo-trace.in
+EXTRA_DIST = \
+	COPYING \
+	COPYING-GPL-3 \
+	cairo-trace.in