tests: Remove duplicate specification of CPPFLAGS for Regress
authorColin Walters <walters@verbum.org>
Wed, 6 Mar 2013 17:13:24 +0000 (12:13 -0500)
committerColin Walters <walters@verbum.org>
Wed, 6 Mar 2013 21:50:53 +0000 (16:50 -0500)
Previous commit introduced the flaw.

tests/scanner/Makefile.am

index 773a221d8d38dc41c982636844b0dc3cd833ef67..d3f2c6c41e6ffff1a814c0258035cc07d80c7928 100644 (file)
@@ -34,7 +34,7 @@ libregress_la_SOURCES = \
        $(srcdir)/foo.c $(srcdir)/foo.h \
        $(srcdir)/drawable.c $(srcdir)/drawable.h \
        $(NULL)
-REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
+REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings '%s' '%f'"
 libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\"
 libregress_la_LIBADD = $(GIO_LIBS)
 if HAVE_CAIRO
@@ -87,7 +87,7 @@ if HAVE_CAIRO
 Regress_1_0_gir_INCLUDES += cairo-1.0 
 endif
 Regress_1_0_gir_FILES = $(libregress_la_SOURCES)
-Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" --warn-error $(libregress_la_CPPFLAGS)
+Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" --warn-error
 GIRS += Regress-1.0.gir
 
 WarnLib-1.0.gir: $(top_builddir)/Gio-2.0.gir libwarnlib.la