From 2f64d504ebc8ac9a4ec3675ce768dda97658192d Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Thu, 31 Dec 2009 15:35:49 +0100 Subject: [PATCH] Simplify Gio-2.0.gir rules Also make sure to add cflags from gio-unix-2.0 to avoid a warning --- gir/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gir/Makefile.am b/gir/Makefile.am index d7c32ca..8087f8f 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -108,19 +108,20 @@ endif if HAVE_GIO_UNIX GIO_UNIX_HDRS=$(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h +GIO_UNIX_PACKAGES = gio-unix-2.0 else GIO_UNIX_HDRS= +GIO_UNIX_PACKAGES = endif Gio-2.0.gir: GObject-2.0.gir Gio_2_0_gir_LIBS = $(GIO_LIBRARY) Gio_2_0_gir_SCANNERFLAGS = --noclosure --strip-prefix=g --c-include="gio/gio.h" -Gio_2_0_gir_PACKAGES = gio-2.0 +Gio_2_0_gir_PACKAGES = gio-2.0 $(GIO_UNIX_PACKAGES) Gio_2_0_gir_INCLUDES = GObject-2.0 Gio_2_0_gir_CFLAGS = \ -DGIO_COMPILATION \ - -I$(GIO_INCLUDEDIR) \ -I$(GIO_LIBDIR)/glib-2.0/include Gio_2_0_gir_FILES = \ $(GIO_UNIX_HDRS) \ -- 2.39.2