diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
| commit | 68ff94340891f1ae4ea24546acdbbc39c4dcbcd0 (patch) | |
| tree | 46f02cba671bcb321482c7961acd91aeee57ced5 /Makefile-gir.am | |
| parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
| parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
| download | gobject-introspection-baserock/markdoffman/1_39_90-merge.tar.gz | |
Merge tag 'GOBJECT_INTROSPECTION_1_39_90' into baserock/markdoffman/1_39_90-mergebaserock/markdoffman/1_39_90-merge
Tag 1_39_90
Conflicts:
autogen.sh
configure.ac
Diffstat (limited to 'Makefile-gir.am')
| -rw-r--r-- | Makefile-gir.am | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Makefile-gir.am b/Makefile-gir.am index 10a4fb03..d1d15d8e 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -1,8 +1,8 @@ BUILT_GIRSOURCES = SUBSTITUTED_GIRSOURCES = -STATIC_GIRSOURCES = \ - gir/DBus-1.0.gir \ +STATIC_GIRSOURCES = \ + gir/DBus-1.0.gir \ gir/DBusGLib-1.0.gir \ gir/fontconfig-2.0.gir \ gir/freetype2-2.0.gir \ @@ -11,7 +11,8 @@ STATIC_GIRSOURCES = \ gir/xft-2.0.gir \ gir/xlib-2.0.gir \ gir/xfixes-4.0.gir \ - gir/xrandr-1.3.gir + gir/xrandr-1.3.gir \ + gir/win32-1.0.gir EXTRA_DIST += $(STATIC_GIRSOURCES) gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile @@ -37,6 +38,7 @@ gir/xft-2.0.typelib: g-ir-compiler gir/xlib-2.0.typelib: g-ir-compiler gir/xfixes-4.0.typelib: g-ir-compiler gir/xrandr-1.3.typelib: g-ir-compiler +gir/win32-1.0.typelib: g-ir-compiler # glib with source (to enable documentation) if WITH_GLIBSRC @@ -150,7 +152,8 @@ GModule_2_0_gir_INCLUDES = GLib-2.0 GModule_2_0_gir_CFLAGS = \ -I$(GMODULE_INCLUDEDIR) \ -I$(GMODULE_LIBDIR)/glib-2.0/include -GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h +GModule_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/gmodule.h \ + gir/gmodule-2.0.c BUILT_GIRSOURCES += GModule-2.0.gir @@ -197,7 +200,7 @@ Gio_2_0_gir_FILES = \ gir/gio-2.0.c BUILT_GIRSOURCES += Gio-2.0.gir -EXTRA_DIST += gir/glib-2.0.c gir/gobject-2.0.c gir/gio-2.0.c +EXTRA_DIST += gir/glib-2.0.c gir/gmodule-2.0.c gir/gobject-2.0.c gir/gio-2.0.c # girepository GIRepository-2.0.gir: GObject-2.0.gir libgirepository-1.0.la |