diff options
| author | Colin Walters <walters@verbum.org> | 2012-08-14 20:27:17 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2012-08-14 20:27:17 -0400 |
| commit | d734a06dc613f81bde3ffa1bfb30b971bac462d6 (patch) | |
| tree | 18bce3625292dd84ef7f199206566e79c58a68ee /tests | |
| parent | 0e13b86146eaa2fd58fc5165b11eb4f8396108fa (diff) | |
| download | gobject-introspection-d734a06dc613f81bde3ffa1bfb30b971bac462d6.tar.gz | |
build: Ensure cairo-gobject always ends up in cairo.gir
We were conditionalizing on the presence of cairo in the buildroot,
but that's super lame since it makes a huge mess of the build
dependency graph.
Let's just always stick cairo-gobject in there. I doubt anyone cares
anymore about building g-i on really old systems without it.
If they do...well, we can revisit this again.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scanner/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 0db77ccc..96923550 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -1,3 +1,5 @@ +NULL ?= + include $(top_srcdir)/common.mk include $(top_srcdir)/Makefile.introspection @@ -10,10 +12,9 @@ check_LTLIBRARIES = \ libfoo.la \ libutility.la \ libgtkfrob.la \ - libgettype.la -if HAVE_CAIRO -check_LTLIBRARIES += libregress.la -endif + libgettype.la \ + libregress.la \ + $(NULL) AM_CPPFLAGS = -I$(top_srcdir)/girepository AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) @@ -69,9 +70,7 @@ Regress_1_0_gir_LIBS = libregress.la Regress_1_0_gir_INCLUDES = cairo-1.0 Gio-2.0 Regress_1_0_gir_FILES = $(libregress_la_SOURCES) Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" --warn-error -if HAVE_CAIRO GIRS += Regress-1.0.gir -endif Annotation-1.0.gir: Utility-1.0.gir libannotation.la Annotation_1_0_gir_PACKAGES = gobject-2.0 |