summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog24
-rw-r--r--configure.in5
-rw-r--r--examples/.cvsignore2
-rw-r--r--examples/Makefile.am2
-rw-r--r--examples/README6
-rw-r--r--examples/pdf-surface/.cvsignore6
-rw-r--r--examples/pdf-surface/Makefile.am7
-rw-r--r--examples/png_file/.cvsignore6
-rw-r--r--examples/png_file/Makefile.am7
-rw-r--r--examples/ps-surface/.cvsignore6
-rw-r--r--examples/ps-surface/Makefile.am7
-rw-r--r--examples/surfaces/Makefile.am14
-rw-r--r--examples/surfaces/image-surface.cc (renamed from examples/png_file/main.cc)0
-rw-r--r--examples/surfaces/pdf-surface.cc (renamed from examples/pdf-surface/main.cc)0
-rw-r--r--examples/surfaces/ps-surface.cc (renamed from examples/ps-surface/main.cc)0
-rw-r--r--examples/surfaces/svg-surface.cc (renamed from examples/svg-surface/main.cc)0
-rw-r--r--examples/svg-surface/.cvsignore6
-rw-r--r--examples/svg-surface/Makefile.am7
18 files changed, 42 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog
index c4e70ef..2245450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
2008-12-12 Jonathon Jongsma <jonathon@quotidian.org>
+ Restructure the examples directory so that there aren't so many subdirs, which
+ tends to slow down builds since they can't be done in parallel. Also
+ 'standardize' the executable names a bit more and give the source files
+ meaningful names rather than 'main.cc' or similar
+
+ * configure.in:
+ * examples/.cvsignore: Removed.
+ * examples/Makefile.am:
+ * examples/README:
+ * examples/pdf-surface/.cvsignore: Removed.
+ * examples/pdf-surface/Makefile.am: Removed.
+ * examples/png_file/.cvsignore: Removed.
+ * examples/png_file/Makefile.am: Removed.
+ * examples/ps-surface/.cvsignore: Removed.
+ * examples/ps-surface/Makefile.am: Removed.
+ * examples/surfaces/image-surface.cc: Renamed from examples/png_file/main.cc.
+ * examples/surfaces/pdf-surface.cc: Renamed from examples/pdf-surface/main.cc.
+ * examples/surfaces/ps-surface.cc: Renamed from examples/ps-surface/main.cc.
+ * examples/surfaces/svg-surface.cc: Renamed from examples/svg-surface/main.cc.
+ * examples/svg-surface/.cvsignore: Removed.
+ * examples/svg-surface/Makefile.am: Removed.
+
+2008-12-12 Jonathon Jongsma <jonathon@quotidian.org>
+
* cairomm/fontface.h: add more documentation about UserFontFace, including a
warning about needing to keep the UserFontFace wrapper around as long as we're
rendering text with that face.
diff --git a/configure.in b/configure.in
index 81abb68..563e870 100644
--- a/configure.in
+++ b/configure.in
@@ -302,10 +302,7 @@ AC_CONFIG_FILES(
data/Makefile
examples/Makefile
- examples/png_file/Makefile
- examples/pdf-surface/Makefile
- examples/ps-surface/Makefile
- examples/svg-surface/Makefile
+ examples/surfaces/Makefile
examples/text/Makefile
tests/Makefile
diff --git a/examples/.cvsignore b/examples/.cvsignore
deleted file mode 100644
index 3dda729..0000000
--- a/examples/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
index b361432..8bcb6ca 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = png_file pdf-surface ps-surface svg-surface text
+SUBDIRS = surfaces text
EXTRA_DIST = README Makefile.am_fragment
diff --git a/examples/README b/examples/README
index 856c911..29413fd 100644
--- a/examples/README
+++ b/examples/README
@@ -1,9 +1,7 @@
Examples:
- pdf-surface: Create a drawing and save it as a PDF document.
- png_file: Create a drawing and save it as a PNG image.
- ps-surface: Create a drawing and save it as a PostScript file.
- svg-surface: Create a drawing and save it as a SVG image.
+ surfaces: demonstrates how to use various surface types
+ text: various examples of drawing text
These examples are built automatically as part of cairomm, and you can
diff --git a/examples/pdf-surface/.cvsignore b/examples/pdf-surface/.cvsignore
deleted file mode 100644
index 7fed4ee..0000000
--- a/examples/pdf-surface/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-example_pdf_file
-image.pdf
diff --git a/examples/pdf-surface/Makefile.am b/examples/pdf-surface/Makefile.am
deleted file mode 100644
index 36455f3..0000000
--- a/examples/pdf-surface/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/examples/Makefile.am_fragment
-
-# build the executable but don't install it
-noinst_PROGRAMS = example_pdf_file
-example_pdf_file_SOURCES = main.cc
-
-CLEANFILES = image.pdf
diff --git a/examples/png_file/.cvsignore b/examples/png_file/.cvsignore
deleted file mode 100644
index 571e858..0000000
--- a/examples/png_file/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-example_png_file
-image.png
diff --git a/examples/png_file/Makefile.am b/examples/png_file/Makefile.am
deleted file mode 100644
index a4095b8..0000000
--- a/examples/png_file/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/examples/Makefile.am_fragment
-
-# build the executable but don't install it
-noinst_PROGRAMS = example_png_file
-example_png_file_SOURCES = main.cc
-
-CLEANFILES = example_png_file.png \ No newline at end of file
diff --git a/examples/ps-surface/.cvsignore b/examples/ps-surface/.cvsignore
deleted file mode 100644
index abece3c..0000000
--- a/examples/ps-surface/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-example_ps_file
-image.ps
diff --git a/examples/ps-surface/Makefile.am b/examples/ps-surface/Makefile.am
deleted file mode 100644
index 91df429..0000000
--- a/examples/ps-surface/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/examples/Makefile.am_fragment
-
-# build the executable but don't install it
-noinst_PROGRAMS = example_ps_file
-example_ps_file_SOURCES = main.cc
-
-CLEANFILES = image.ps
diff --git a/examples/surfaces/Makefile.am b/examples/surfaces/Makefile.am
new file mode 100644
index 0000000..ea7c50c
--- /dev/null
+++ b/examples/surfaces/Makefile.am
@@ -0,0 +1,14 @@
+include $(top_srcdir)/examples/Makefile.am_fragment
+
+# build the executable but don't install it
+noinst_PROGRAMS = pdf-surface \
+ ps-surface \
+ svg-surface \
+ image-surface
+
+pdf_surface_SOURCES = pdf-surface.cc
+ps_surface_SOURCES = ps-surface.cc
+svg_surface_SOURCES = svg-surface.cc
+image_surface_SOURCES = image-surface.cc
+
+CLEANFILES = image.pdf image.ps image.svg example_png_file.png
diff --git a/examples/png_file/main.cc b/examples/surfaces/image-surface.cc
index 8423f2f..8423f2f 100644
--- a/examples/png_file/main.cc
+++ b/examples/surfaces/image-surface.cc
diff --git a/examples/pdf-surface/main.cc b/examples/surfaces/pdf-surface.cc
index a4114ed..a4114ed 100644
--- a/examples/pdf-surface/main.cc
+++ b/examples/surfaces/pdf-surface.cc
diff --git a/examples/ps-surface/main.cc b/examples/surfaces/ps-surface.cc
index d6049d8..d6049d8 100644
--- a/examples/ps-surface/main.cc
+++ b/examples/surfaces/ps-surface.cc
diff --git a/examples/svg-surface/main.cc b/examples/surfaces/svg-surface.cc
index 5bab1dd..5bab1dd 100644
--- a/examples/svg-surface/main.cc
+++ b/examples/surfaces/svg-surface.cc
diff --git a/examples/svg-surface/.cvsignore b/examples/svg-surface/.cvsignore
deleted file mode 100644
index b79fcf4..0000000
--- a/examples/svg-surface/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-example_svg_file
-image.svg
diff --git a/examples/svg-surface/Makefile.am b/examples/svg-surface/Makefile.am
deleted file mode 100644
index cf8e094..0000000
--- a/examples/svg-surface/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-include $(top_srcdir)/examples/Makefile.am_fragment
-
-# build the executable but don't install it
-noinst_PROGRAMS = example_svg_file
-example_svg_file_SOURCES = main.cc
-
-CLEANFILES = image.svg
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-21 05:51:26 +0000