diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2018-09-19 14:11:27 +0200 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2018-09-19 14:11:27 +0200 |
| commit | 73625a038f308160375bef5ded796fae1a903265 (patch) | |
| tree | 5b1a3bfaf2df97f0ea88d5dd45455a3d8f0287f6 /farstream | |
| parent | 73891c28fa27d5e65a71762e826f13747d743588 (diff) | |
| download | farstream-73625a038f308160375bef5ded796fae1a903265.tar.gz | |
Update common/ to latest
Diffstat (limited to 'farstream')
| -rw-r--r-- | farstream/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/farstream/Makefile.am b/farstream/Makefile.am index 510c39c2..36a820d1 100644 --- a/farstream/Makefile.am +++ b/farstream/Makefile.am @@ -73,6 +73,7 @@ glib_enum_headers=$(public_headers) glib_enum_define=FS glib_gen_prefix=_fs glib_gen_basename=fs +glib_gen_decl_include=\#include <glib-object.h> include $(top_srcdir)/common-modified/gst-glib-gen.mak @@ -83,8 +84,9 @@ introspection_sources = \ $(nodist_libfarstreaminclude_HEADERS) \ $(libfarstreaminclude_HEADERS) + INTROSPECTION_GIRS = Farstream-@FS_APIVERSION@.gir -Farstream-@FS_APIVERSION@.gir: libfarstream-@FS_APIVERSION@.la +Farstream_@FS_API_VERSION@_gir: libfarstream_@FS_APIVERSION@.la Farstream_@FS_API_VERSION@_gir_NAMESPACE = Farstream Farstream_@FS_API_VERSION@_gir_VERSION = @FS_APIVERSION@ Farstream_@FS_API_VERSION@_gir_LIBS = libfarstream-@FS_APIVERSION@.la @@ -94,8 +96,7 @@ Farstream_@FS_API_VERSION@_gir_CFLAGS = $(FS_INTERNAL_CFLAGS) Farstream_@FS_API_VERSION@_gir_SCANNERFLAGS = --symbol-prefix=fs \ --identifier-prefix=Fs --add-init-section="gst_init(NULL,NULL);" \ --pkg-export=farstream-@FS_APIVERSION@ \ - $(foreach hdr,$(public_headers),--c-include=$(hdr)) -Farstream_@FS_API_VERSION@_gir_LDFLAGS = $(GST_LIBS) + $(foreach hdr,$(public_headers),--c-include=$(hdr)) --include-last-in-header=gst/gst.h girdir = $(datadir)/gir-1.0 dist_gir_DATA = Farstream-@FS_APIVERSION@.gir |