brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[introspection] Add --c-include to g-ir-scanner

Browse Source 
Since Clutter has a single-include header policy we need to put
the header to be included inside the GIR file.
This commit is contained in:
Emmanuele Bassi 2009-06-09 12:40:06 +01:00
parent 8728afa2ee
commit 91856b1bed
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clutter/Makefile.am
View File

@ -249,24 +249,26 @@ endif
# subdir Makefile.am, so just extract them from cogl.h instead. The doc # subdir Makefile.am, so just extract them from cogl.h instead. The doc
# comments for COGL are in the headers, so we don't need the source files. # comments for COGL are in the headers, so we don't need the source files.
Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la
$(INTROSPECTION_SCANNER) -v --namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \ $(INTROSPECTION_SCANNER) -v \
$(INCLUDES) \ --namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \
--add-include-path=cogl \ $(INCLUDES) \
$(json_gir_include_path) \ --add-include-path=cogl \
--include=GL-1.0 \ $(json_gir_include_path) \
--include=GObject-2.0 \ --c-include='clutter/clutter.h' \
--include=Pango-1.0 \ --include=GL-1.0 \
--include=PangoCairo-1.0 \ --include=GObject-2.0 \
--include=Cogl-@CLUTTER_API_VERSION@ \ --include=Pango-1.0 \
--include=ClutterJson-@CLUTTER_API_VERSION@ \ --include=PangoCairo-1.0 \
--library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \ --include=Cogl-@CLUTTER_API_VERSION@ \
--libtool="$(top_builddir)/doltlibtool" \ --include=ClutterJson-@CLUTTER_API_VERSION@ \
--pkg gobject-2.0 \ --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
--pkg pango \ --libtool="$(top_builddir)/doltlibtool" \
--pkg pangocairo \ --pkg gobject-2.0 \
--output $@ \ --pkg pango \
$(clutter_HEADERS) \ --pkg pangocairo \
$(source_c) --output $@ \
$(clutter_HEADERS) \
$(source_c)
BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir

1
clutter/cogl/Makefile.am
View File

@ -72,6 +72,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la
-I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ \ -I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \
-DCLUTTER_COMPILATION \ -DCLUTTER_COMPILATION \
--c-include='cogl/cogl.h' \
--include=GL-1.0 \ --include=GL-1.0 \
--include=GObject-2.0 \ --include=GObject-2.0 \
--library=clutter-cogl \ --library=clutter-cogl \