diff options
| author | Xan Lopez <xan@gnome.org> | 2009-12-26 01:55:48 +0800 |
|---|---|---|
| committer | Xan Lopez <xan@gnome.org> | 2009-12-26 02:25:11 +0800 |
| commit | 5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a (patch) | |
| tree | ce80d20269c776e8231bdd37eccf2bb52e3143cb /src | |
| parent | 0b844bedb99264ae3699fb6a6aafa5e716b8c5ac (diff) | |
| download | gsoc2013-epiphany-5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a.tar gsoc2013-epiphany-5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a.tar.gz gsoc2013-epiphany-5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a.tar.bz2 gsoc2013-epiphany-5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a.tar.lz gsoc2013-epiphany-5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a.tar.xz gsoc2013-epiphany-5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a.tar.zst gsoc2013-epiphany-5ed79e7e20e53a2aa2e3ace40ebbb13584c09f2a.zip | |
Use introspection.m4 file to detect introspection support
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2ba6f2392..725db9f3f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -170,7 +170,7 @@ epiphany_LDADD = \ $(DBUS_LIBS) \ $(LIBINTL) -if ENABLE_INTROSPECTION +if HAVE_INTROSPECTION epiphany_CFLAGS += $(INTROSPECTION_CFLAGS) epiphany_LDADD += $(INTROSPECTION_LIBS) endif @@ -266,7 +266,7 @@ CLEANFILES = $(stamp_files) $(BUILT_SOURCES) DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -if ENABLE_INTROSPECTION +if HAVE_INTROSPECTION EPHY_GIR_H_FILES = \ $(top_srcdir)/embed/ephy-embed.h \ $(top_srcdir)/embed/ephy-embed-container.h \ @@ -335,10 +335,10 @@ EPHY_GIR_C_FILES = \ $(top_srcdir)/src/ephy-window.c \ $(NULL) -Epiphany-$(EPIPHANY_API_VERSION).gir: $(G_IR_SCANNER) $(EPHY_GIR_H_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 \ - $(G_IR_SCANNER) -v \ + $(INTROSPECTION_SCANNER) -v \ --namespace Epiphany \ --nsversion=$(EPIPHANY_API_VERSION) \ --add-include-path=. \ @@ -364,10 +364,10 @@ gir_DATA = Epiphany-$(EPIPHANY_API_VERSION).gir typelibsdir = $(GIRTYPELIBDIR) typelibs_DATA = Epiphany-$(EPIPHANY_API_VERSION).typelib -Epiphany-$(EPIPHANY_API_VERSION).typelib: Epiphany-$(EPIPHANY_API_VERSION).gir $(G_IR_COMPILER) - $(AM_V_GEN) g-ir-compiler Epiphany-$(EPIPHANY_API_VERSION).gir -o Epiphany-$(EPIPHANY_API_VERSION).typelib +Epiphany-$(EPIPHANY_API_VERSION).typelib: Epiphany-$(EPIPHANY_API_VERSION).gir $(INTROSPECTION_COMPILER) + $(AM_V_GEN) $(INTROSPECTION_COMPILER) Epiphany-$(EPIPHANY_API_VERSION).gir -o Epiphany-$(EPIPHANY_API_VERSION).typelib EXTRA_DIST += Epiphany-$(EPIPHANY_API_VERSION).gir CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif # ENABLE_INTROSPECTION +endif # HAVE_INTROSPECTION |