summaryrefslogtreecommitdiff
path: root/gir
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2009-12-31 15:35:49 +0100
committerJohan Dahlin <johan@gnome.org>2009-12-31 15:35:49 +0100
commit2f64d504ebc8ac9a4ec3675ce768dda97658192d (patch)
tree0ffc8de84e9650f1fdfac4d75f166bca1105c4c6 /gir
parent6b0a4d8d55385ca59c5b165fee9173d640ab2a19 (diff)
downloadgobject-introspection-2f64d504ebc8ac9a4ec3675ce768dda97658192d.tar.gz
Simplify Gio-2.0.gir rules
Also make sure to add cflags from gio-unix-2.0 to avoid a warning
Diffstat (limited to 'gir')
-rw-r--r--gir/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am
index d7c32ca8..8087f8fe 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) \