summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore27
-rw-r--r--ChangeLog23
-rw-r--r--Makefile.am25
-rw-r--r--configure.in55
-rw-r--r--data/Makefile.am24
-rw-r--r--data/cairomm-1.0.pc.in (renamed from cairomm-1.0.pc.in)0
-rw-r--r--data/cairomm-ft-1.0.pc.in (renamed from cairomm-ft-1.0.pc.in)0
-rw-r--r--data/cairomm-pdf-1.0.pc.in (renamed from cairomm-pdf-1.0.pc.in)0
-rw-r--r--data/cairomm-png-1.0.pc.in (renamed from cairomm-png-1.0.pc.in)0
-rw-r--r--data/cairomm-ps-1.0.pc.in (renamed from cairomm-ps-1.0.pc.in)0
-rw-r--r--data/cairomm-quartz-1.0.pc.in (renamed from cairomm-quartz-1.0.pc.in)0
-rw-r--r--data/cairomm-quartz-font-1.0.pc.in (renamed from cairomm-quartz-font-1.0.pc.in)0
-rw-r--r--data/cairomm-quartz-image-1.0.pc.in (renamed from cairomm-quartz-image-1.0.pc.in)0
-rw-r--r--data/cairomm-svg-1.0.pc.in (renamed from cairomm-svg-1.0.pc.in)0
-rw-r--r--data/cairomm-win32-1.0.pc.in (renamed from cairomm-win32-1.0.pc.in)0
-rw-r--r--data/cairomm-win32-font-1.0.pc.in (renamed from cairomm-win32-font-1.0.pc.in)0
-rw-r--r--data/cairomm-xlib-1.0.pc.in (renamed from cairomm-xlib-1.0.pc.in)0
-rw-r--r--data/cairomm-xlib-xrender-1.0.pc.in (renamed from cairomm-xlib-xrender-1.0.pc.in)0
18 files changed, 87 insertions, 67 deletions
diff --git a/.gitignore b/.gitignore
index 7e8b7f8..f20e940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,20 +3,19 @@ Makefile
Makefile.in
aclocal.m4
autom4te.cache
-cairomm-1.0.pc
-cairomm-ft-1.0.pc
-cairomm-pdf-1.0.pc
-cairomm-png-1.0.pc
-cairomm-ps-1.0.pc
-cairomm-svg-1.0.pc
-cairomm-xlib-1.0.pc
-cairomm-xlib-xrender-1.0.pc
-cairomm-win32-1.0.pc
-cairomm-win32-font-1.0.pc
-cairomm-quartz-1.0.pc
-cairomm-quartz-font-1.0.pc
-cairomm-quartz-image-1.0.pc
-cairomm-1.3.0.tar.gz
+data/cairomm-1.0.pc
+data/cairomm-ft-1.0.pc
+data/cairomm-pdf-1.0.pc
+data/cairomm-png-1.0.pc
+data/cairomm-ps-1.0.pc
+data/cairomm-svg-1.0.pc
+data/cairomm-xlib-1.0.pc
+data/cairomm-xlib-xrender-1.0.pc
+data/cairomm-win32-1.0.pc
+data/cairomm-win32-font-1.0.pc
+data/cairomm-quartz-1.0.pc
+data/cairomm-quartz-font-1.0.pc
+data/cairomm-quartz-image-1.0.pc
.deps
.libs
config.guess
diff --git a/ChangeLog b/ChangeLog
index 5b6402d..6a39585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
2008-10-22 Jonathon Jongsma <jonathon@quotidian.org>
+ * .gitignore:
+ * Makefile.am:
+ * configure.in: moved pkgconfig files to a data subdirectory, and consolidated
+ all dependency checks into one PKG_CHECK_MODULES call so that we don't have
+ duplicate libs or flags in the compiler command line due to checking all of
+ teh deps individually and then aggregating them
+ * data/Makefile.am: Added.
+ * data/cairomm-1.0.pc.in: Renamed from cairomm-1.0.pc.in.
+ * data/cairomm-ft-1.0.pc.in: Renamed from cairomm-ft-1.0.pc.in.
+ * data/cairomm-pdf-1.0.pc.in: Renamed from cairomm-pdf-1.0.pc.in.
+ * data/cairomm-png-1.0.pc.in: Renamed from cairomm-png-1.0.pc.in.
+ * data/cairomm-ps-1.0.pc.in: Renamed from cairomm-ps-1.0.pc.in.
+ * data/cairomm-quartz-1.0.pc.in: Renamed from cairomm-quartz-1.0.pc.in.
+ * data/cairomm-quartz-font-1.0.pc.in: Renamed from cairomm-quartz-font-1.0.pc.in.
+ * data/cairomm-quartz-image-1.0.pc.in: Renamed from cairomm-quartz-image-1.0.pc.in.
+ * data/cairomm-svg-1.0.pc.in: Renamed from cairomm-svg-1.0.pc.in.
+ * data/cairomm-win32-1.0.pc.in: Renamed from cairomm-win32-1.0.pc.in.
+ * data/cairomm-win32-font-1.0.pc.in: Renamed from cairomm-win32-font-1.0.pc.in.
+ * data/cairomm-xlib-1.0.pc.in: Renamed from cairomm-xlib-1.0.pc.in.
+ * data/cairomm-xlib-xrender-1.0.pc.in: Renamed from cairomm-xlib-xrender-1.0.pc.in.
+
+2008-10-22 Jonathon Jongsma <jonathon@quotidian.org>
+
* cairomm/pattern.cc:
* cairomm/pattern.h: Fix broken get/set_matrix() API that was using the C
cairo_matrix_t type instead of Cairo::Matrix. This should be an
diff --git a/Makefile.am b/Makefile.am
index ace619f..7064426 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,34 +1,13 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = cairomm examples MSVC_Net2005 MSVC_Net2008 $(DOCS_SUBDIR) tests
+SUBDIRS = cairomm data examples MSVC_Net2005 MSVC_Net2008 $(DOCS_SUBDIR) tests
#docs examples
ACLOCAL_AMFLAGS = -I m4
-# This is a list of all of the possible pkg-config files that can be generated.
-# Specific ones to be installed are determined in configure.in
-ALL_PC_IN = cairomm-1.0.pc.in \
- cairomm-ft-1.0.pc.in \
- cairomm-pdf-1.0.pc.in \
- cairomm-png-1.0.pc.in \
- cairomm-ps-1.0.pc.in \
- cairomm-quartz-1.0.pc.in \
- cairomm-quartz-font-1.0.pc.in \
- cairomm-quartz-image-1.0.pc.in \
- cairomm-svg-1.0.pc.in \
- cairomm-win32-1.0.pc.in \
- cairomm-win32-font-1.0.pc.in \
- cairomm-xlib-1.0.pc.in \
- cairomm-xlib-xrender-1.0.pc.in
-
-EXTRA_DIST = MAINTAINERS $(ALL_PC_IN)
+EXTRA_DIST = MAINTAINERS
DIST_SUBDIRS = $(SUBDIRS)
-# Install the pkg-config files:
-pkgconfigdir = $(libdir)/pkgconfig
-# $INSTALLED_PC is computed in configure.in
-pkgconfig_DATA = cairomm-1.0.pc $(INSTALLED_PC)
-
# Copied from cairo/Makefile.am:
#
# Some custom targets to make it easier to release things.
diff --git a/configure.in b/configure.in
index 8de81a6..0c2d22c 100644
--- a/configure.in
+++ b/configure.in
@@ -111,98 +111,92 @@ AC_CHECK_HEADERS(math.h)
########################
# Determine Dependencies
########################
-dnl first just make sure that our base requirements are met
-PKG_CHECK_MODULES(CAIROMM,
- [cairo >= 1.8.0
- sigc++-2.0])
+dnl base dependencies
+DEPS_PC="cairo >= 1.8.0
+ sigc++-2.0"
dnl then check and add additional dependencies
PKG_CHECK_MODULES(CAIROFT, cairo-ft, [HAS_FT=yes], [HAS_FT=no])
if test x$HAS_FT = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-ft-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROFT_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROFT_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-ft"
fi
PKG_CHECK_MODULES(CAIROPDF, cairo-pdf, [HAS_PDF=yes], [HAS_PDF=no])
if test x$HAS_PDF = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-pdf-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROPDF_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROPDF_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-pdf"
fi
PKG_CHECK_MODULES(CAIROPNG, cairo-png, [HAS_PNG=yes], [HAS_PNG=no])
if test x$HAS_PNG = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-png-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROPNG_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROPNG_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-png"
fi
PKG_CHECK_MODULES(CAIROPS, cairo-ps, [HAS_PS=yes], [HAS_PS=no])
if test x$HAS_PS = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-ps-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROPS_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROPS_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-ps"
fi
PKG_CHECK_MODULES(CAIROSVG, cairo-svg, [HAS_SVG=yes], [HAS_SVG=no])
if test x$HAS_SVG = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-svg-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROSVG_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROSVG_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-svg"
fi
PKG_CHECK_MODULES(CAIROXLIB, cairo-xlib, [HAS_XLIB=yes], [HAS_XLIB=no])
if test x$HAS_XLIB = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-xlib-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROXLIB_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROXLIB_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-xlib"
fi
PKG_CHECK_MODULES(CAIROXLIBXRENDER, cairo-xlib-xrender, [HAS_XLIBXRENDER=yes], [HAS_XLIBXRENDER=no])
if test x$HAS_XLIBXRENDER = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-xlib-xrender-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROXLIBXRENDER_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROXLIBXRENDER_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-xlib-xrender"
fi
PKG_CHECK_MODULES(CAIROWIN32, cairo-win32, [HAS_WIN32=yes], [HAS_WIN32=no])
if test x$HAS_WIN32 = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-win32-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROWIN32_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROWIN32_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-win32"
fi
PKG_CHECK_MODULES(CAIROWIN32FONT, cairo-win32-font, [HAS_WIN32FONT=yes], [HAS_WIN32FONT=no])
if test x$HAS_WIN32FONT = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-win32-font-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROWIN32FONT_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROWIN32FONT_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-win32-font"
fi
PKG_CHECK_MODULES(CAIROQUARTZ, cairo-quartz, [HAS_QUARTZ=yes], [HAS_QUARTZ=no])
if test x$HAS_QUARTZ = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-quartz-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROQUARTZ_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROQUARTZ_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-quartz"
fi
PKG_CHECK_MODULES(CAIROQUARTZFONT, cairo-quartz-font, [HAS_QUARTZFONT=yes], [HAS_QUARTZFONT=no])
if test x$HAS_QUARTZFONT = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-quartz-font-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROQUARTZFONT_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROQUARTZFONT_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-quartz-font"
fi
PKG_CHECK_MODULES(CAIROQUARTZIMAGE, cairo-quartz-image, [HAS_QUARTZIMAGE=yes], [HAS_QUARTZIMAGE=no])
if test x$HAS_QUARTZIMAGE = xyes; then
INSTALLED_PC="$INSTALLED_PC cairomm-quartz-image-1.0.pc"
- CAIROMM_LIBS="$CAIROMM_LIBS $CAIROQUARTZIMAGE_LIBS"
- CAIROMM_CFLAGS="$CAIROMM_CFLAGS $CAIROQUARTZIMAGE_CFLAGS"
+ DEPS_PC="$DEPS_PC cairo-quartz-image"
fi
+PKG_CHECK_MODULES(CAIROMM, [$DEPS_PC])
+
AC_SUBST(INSTALLED_PC)
+CONFIG_PC=data/cairomm-1.0.pc
+for pc in $INSTALLED_PC; do
+ CONFIG_PC="$CONFIG_PC data/$pc"
+done
+
AC_ARG_ENABLE(tests,
AC_HELP_STRING([--enable-tests=yes|no],
@@ -287,6 +281,8 @@ AC_CONFIG_FILES(
Makefile
cairomm/Makefile
+ data/Makefile
+
examples/Makefile
examples/png_file/Makefile
examples/pdf-surface/Makefile
@@ -296,8 +292,7 @@ AC_CONFIG_FILES(
tests/Makefile
- cairomm-1.0.pc
- $INSTALLED_PC
+ $CONFIG_PC
)
AC_CONFIG_FILES([
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..48f90de
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+# This is a list of all of the possible pkg-config files that can be generated.
+# Specific ones to be installed are determined in configure.in
+ALL_PC_IN = cairomm-1.0.pc.in \
+ cairomm-ft-1.0.pc.in \
+ cairomm-pdf-1.0.pc.in \
+ cairomm-png-1.0.pc.in \
+ cairomm-ps-1.0.pc.in \
+ cairomm-quartz-1.0.pc.in \
+ cairomm-quartz-font-1.0.pc.in \
+ cairomm-quartz-image-1.0.pc.in \
+ cairomm-svg-1.0.pc.in \
+ cairomm-win32-1.0.pc.in \
+ cairomm-win32-font-1.0.pc.in \
+ cairomm-xlib-1.0.pc.in \
+ cairomm-xlib-xrender-1.0.pc.in
+
+EXTRA_DIST = $(ALL_PC_IN)
+
+# Install the pkg-config files:
+pkgconfigdir = $(libdir)/pkgconfig
+# $INSTALLED_PC is computed in configure.in
+pkgconfig_DATA = cairomm-1.0.pc $(INSTALLED_PC)
diff --git a/cairomm-1.0.pc.in b/data/cairomm-1.0.pc.in
index 4a19e83..4a19e83 100644
--- a/cairomm-1.0.pc.in
+++ b/data/cairomm-1.0.pc.in
diff --git a/cairomm-ft-1.0.pc.in b/data/cairomm-ft-1.0.pc.in
index 13326ab..13326ab 100644
--- a/cairomm-ft-1.0.pc.in
+++ b/data/cairomm-ft-1.0.pc.in
diff --git a/cairomm-pdf-1.0.pc.in b/data/cairomm-pdf-1.0.pc.in
index 5a14a54..5a14a54 100644
--- a/cairomm-pdf-1.0.pc.in
+++ b/data/cairomm-pdf-1.0.pc.in
diff --git a/cairomm-png-1.0.pc.in b/data/cairomm-png-1.0.pc.in
index 8566f8e..8566f8e 100644
--- a/cairomm-png-1.0.pc.in
+++ b/data/cairomm-png-1.0.pc.in
diff --git a/cairomm-ps-1.0.pc.in b/data/cairomm-ps-1.0.pc.in
index ad5e735..ad5e735 100644
--- a/cairomm-ps-1.0.pc.in
+++ b/data/cairomm-ps-1.0.pc.in
diff --git a/cairomm-quartz-1.0.pc.in b/data/cairomm-quartz-1.0.pc.in
index ebb30bf..ebb30bf 100644
--- a/cairomm-quartz-1.0.pc.in
+++ b/data/cairomm-quartz-1.0.pc.in
diff --git a/cairomm-quartz-font-1.0.pc.in b/data/cairomm-quartz-font-1.0.pc.in
index 14913ce..14913ce 100644
--- a/cairomm-quartz-font-1.0.pc.in
+++ b/data/cairomm-quartz-font-1.0.pc.in
diff --git a/cairomm-quartz-image-1.0.pc.in b/data/cairomm-quartz-image-1.0.pc.in
index 25bd8c7..25bd8c7 100644
--- a/cairomm-quartz-image-1.0.pc.in
+++ b/data/cairomm-quartz-image-1.0.pc.in
diff --git a/cairomm-svg-1.0.pc.in b/data/cairomm-svg-1.0.pc.in
index 151c576..151c576 100644
--- a/cairomm-svg-1.0.pc.in
+++ b/data/cairomm-svg-1.0.pc.in
diff --git a/cairomm-win32-1.0.pc.in b/data/cairomm-win32-1.0.pc.in
index 99c1285..99c1285 100644
--- a/cairomm-win32-1.0.pc.in
+++ b/data/cairomm-win32-1.0.pc.in
diff --git a/cairomm-win32-font-1.0.pc.in b/data/cairomm-win32-font-1.0.pc.in
index eaa73f0..eaa73f0 100644
--- a/cairomm-win32-font-1.0.pc.in
+++ b/data/cairomm-win32-font-1.0.pc.in
diff --git a/cairomm-xlib-1.0.pc.in b/data/cairomm-xlib-1.0.pc.in
index 6713254..6713254 100644
--- a/cairomm-xlib-1.0.pc.in
+++ b/data/cairomm-xlib-1.0.pc.in
diff --git a/cairomm-xlib-xrender-1.0.pc.in b/data/cairomm-xlib-xrender-1.0.pc.in
index 9484884..9484884 100644
--- a/cairomm-xlib-xrender-1.0.pc.in
+++ b/data/cairomm-xlib-xrender-1.0.pc.in
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 17:14:49 +0000