From 95b03cf87efbd4fea4b7d55601c9752cefd29bfc Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Sun, 24 Feb 2013 17:34:56 +1100 Subject: gi-r-scanner: add support for raw CFLAGS flags option gi-r-scanner chokes when gir_CFLAGS have an '-include
' since this is not a recognised option. This commit adds a new --cflags option that passes cflags directly to the spawned gcc. https://bugzilla.gnome.org/show_bug.cgi?id=695182 --- Makefile.introspection | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.introspection') diff --git a/Makefile.introspection b/Makefile.introspection index 567d5e96..8424c738 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -142,7 +142,7 @@ $(1): $$($(_gir_name)_FILES) $(_gir_program) \ $(_gir_libraries) \ $($(_gir_name)_SCANNERFLAGS) \ - $($(_gir_name)_CFLAGS) \ + --cflags="$($(_gir_name)_CFLAGS)" \ $($(_gir_name)_LDFLAGS) \ $$^ \ --output $(1) -- cgit v1.2.1 From b051c92cdfbe8255de27bba658a5a95d626accb9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 5 Mar 2013 18:23:25 -0500 Subject: Revert "gi-r-scanner: add support for raw CFLAGS flags option" Doesn't work with arguments that have shell quotes. This reverts commit 95b03cf87efbd4fea4b7d55601c9752cefd29bfc. --- Makefile.introspection | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.introspection') diff --git a/Makefile.introspection b/Makefile.introspection index 8424c738..567d5e96 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -142,7 +142,7 @@ $(1): $$($(_gir_name)_FILES) $(_gir_program) \ $(_gir_libraries) \ $($(_gir_name)_SCANNERFLAGS) \ - --cflags="$($(_gir_name)_CFLAGS)" \ + $($(_gir_name)_CFLAGS) \ $($(_gir_name)_LDFLAGS) \ $$^ \ --output $(1) -- cgit v1.2.1 From 7639a440b43ea1197de96035304404b0c87db608 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 6 Mar 2013 12:16:24 -0500 Subject: scanner: Allow CFLAGS to contain arbitrary preprocessor commands like -include Newer spidermonkey .pc file contains a -include argument, which g-ir-scanner doesn't understand. Rather than us attempting to replicate all of cpp's options, use wrapper arguments in Makefile.introspection to pass them through. https://bugzilla.gnome.org/show_bug.cgi?id=695182 --- Makefile.introspection | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile.introspection') diff --git a/Makefile.introspection b/Makefile.introspection index 567d5e96..b3473377 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -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) -- cgit v1.2.1 From e2e16964ee6d68a7ef3b0bbcadb6922ce1e7f563 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 6 Jun 2013 10:00:58 +1200 Subject: Fix indentation on pretty printed Makefile rules https://bugzilla.gnome.org/show_bug.cgi?id=701679 --- Makefile.introspection | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile.introspection') diff --git a/Makefile.introspection b/Makefile.introspection index b3473377..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 -- cgit v1.2.1