Commit 3e0b443c authored by Dan Winship's avatar Dan Winship Committed by Johan Dahlin
Browse files

Makefile.introspection: use $^, simplifying non-srcdir builds

In the .gir-building rule, use "$^" to refer to the source files,
since that automatically looks in both $(srcdir) and $(builddir). This
is particularly important since certain generated files will be in
$(builddir) when building from git, but in $(srcdir) when building
from tarballs

If you were previously prefixing $(srcdir) to the Foo_gir_FILES
members by hand, you should stop now.

(Also, removed the dependencies on $(INTROSPECTION_SCANNER) and
$(INTROSPECTION_COMPILER) for the .gir/.typelib rules, since the
scanner one was broken anyway, and we don't have that kind of
dependency for other rules (eg, making .o files depend on
/usr/bin/gcc).)

https://bugzilla.gnome.org/show_bug.cgi?id=616425
parent 891ba6c4
......@@ -114,7 +114,7 @@ $(if $(or $($(_gir_name)_LIBS),
# Only dependencies we know are actually filenames goes into _FILES, make
# sure these are built before running the scanner. Libraries and programs
# needs to be added manually.
$(1): $$($(_gir_name)_FILES) $(INTROSPECTION_PARSER)
$(1): $$($(_gir_name)_FILES)
$(_gir_silent_scanner) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \
--namespace=$(_gir_namespace) \
--nsversion=$(_gir_version) \
......@@ -125,7 +125,7 @@ $(1): $$($(_gir_name)_FILES) $(INTROSPECTION_PARSER)
$(_gir_includes) \
$($(_gir_name)_SCANNERFLAGS) \
$($(_gir_name)_CFLAGS) \
$($(_gir_name)_FILES) \
$$^ \
--output $(1)
endef
......@@ -141,5 +141,5 @@ $(_gir_silent_compiler) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS)
endef
# Simple rule to compile a typelib.
%.typelib: %.gir $(INTROSPECTION_COMPILER)
%.typelib: %.gir
$(call introspection-compiler,$<,$@)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment