diff options
author | Xan Lopez <xan@gnome.org> | 2010-10-04 17:36:24 +0800 |
---|---|---|
committer | Xan Lopez <xan@gnome.org> | 2010-10-04 17:36:24 +0800 |
commit | 2d67545a24df8c486588043ab43c5af322251ab5 (patch) | |
tree | aee4771b4eb5e60ea7ada6e3cf72066bbf05961b | |
parent | ab655bba1c4a1724b8ccae12de68ec762760fea5 (diff) | |
download | gsoc2013-epiphany-2d67545a24df8c486588043ab43c5af322251ab5.tar.gz gsoc2013-epiphany-2d67545a24df8c486588043ab43c5af322251ab5.tar.zst gsoc2013-epiphany-2d67545a24df8c486588043ab43c5af322251ab5.zip |
Use gobject-introspection 0.9.5 syntax
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/Makefile.am | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ab4f7452d..16166e668 100644 --- a/configure.ac +++ b/configure.ac @@ -212,7 +212,7 @@ EPIPHANY_FEATURES= # GObject Introspection # ********************* -GOBJECT_INTROSPECTION_CHECK([0.6.7]) +GOBJECT_INTROSPECTION_CHECK([0.9.5]) if test "$found_introspection" = "yes"; then EPIPHANY_FEATURES="$EPIPHANY_FEATURES introspection" diff --git a/src/Makefile.am b/src/Makefile.am index 9906cffd5..50e0abfe1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -336,8 +336,10 @@ EPHY_GIR_C_FILES = \ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \ $(EPHY_GIR_C_FILES) epiphany $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ - $(INTROSPECTION_SCANNER) -v \ - --namespace Epiphany \ + $(INTROSPECTION_SCANNER) -v --warn-all \ + --identifier-prefix=Ephy \ + --symbol-prefix=ephy \ + --namespace=Epiphany \ --nsversion=$(EPIPHANY_API_VERSION) \ --add-include-path=. \ --add-include-path=$(srcdir) \ @@ -345,8 +347,8 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE --include=libxml2-2.0 \ --include=WebKit-3.0 \ --program=./epiphany \ - --output $@ \ - --pkg epiphany-$(EPIPHANY_API_VERSION) \ + --output=$@ \ + --pkg=epiphany-$(EPIPHANY_API_VERSION) \ -DEPIPHANY_COMPILATION \ -I$(top_srcdir)/embed \ -I$(top_srcdir)/lib \ |