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.introspection | |
| 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.introspection')
| -rw-r--r-- | Makefile.introspection | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.introspection b/Makefile.introspection index 567d5e96..bcfecba4 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -75,14 +75,14 @@ _gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) _gir_silent_scanner_prefix = $(_gir_silent_scanner_prefix_$(V)) _gir_silent_scanner_prefix_ = $(_gir_silent_scanner_prefix_$(_gir_verbosity)) -_gir_silent_scanner_prefix_0 = @echo " GISCAN $(1)"; +_gir_silent_scanner_prefix_0 = @echo " GISCAN $(1)"; _gir_silent_scanner_opts = $(_gir_silent_scanner_opts_$(V)) _gir_silent_scanner_opts_ = $(_gir_silent_scanner_opts_$(_gir_verbosity)) _gir_silent_scanner_opts_0 = --quiet _gir_silent_compiler = $(_gir_silent_compiler_$(V)) _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity)) -_gir_silent_compiler_0 = @echo " GICOMP $(1)"; +_gir_silent_compiler_0 = @echo " GICOMP $(1)"; # # Creates a GIR by scanning C headers/sources @@ -142,7 +142,9 @@ $(1): $$($(_gir_name)_FILES) $(_gir_program) \ $(_gir_libraries) \ $($(_gir_name)_SCANNERFLAGS) \ + --cflags-begin \ $($(_gir_name)_CFLAGS) \ + --cflags-end \ $($(_gir_name)_LDFLAGS) \ $$^ \ --output $(1) |