[gobject-introspection] Makefile.introspection: use $^, simplifying non-srcdir builds
- From: Johan Dahlin <johan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Makefile.introspection: use $^, simplifying non-srcdir builds
- Date: Thu, 20 May 2010 15:04:09 +0000 (UTC)
commit 3e0b443cf552347ebda086cb16003a8d55222870
Author: Dan Winship <danw gnome org>
Date: Wed Apr 21 14:55:17 2010 -0400
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
Makefile.introspection | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.introspection b/Makefile.introspection
index bf9957a..b23ac02 100644
--- a/Makefile.introspection
+++ b/Makefile.introspection
@@ -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,$<,$@)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]