Disable introspection again

Until I figure out the build issues.  Sigh...
This commit is contained in:
Behdad Esfahbod 2012-06-24 13:20:56 -04:00
parent 8c5f5e6f5e
commit 8c0ea7bcb4
2 changed files with 22 additions and 22 deletions

View File

@ -49,7 +49,7 @@ m4_define([hb_libtool_current],
HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age
AC_SUBST(HB_LIBTOOL_VERSION_INFO) AC_SUBST(HB_LIBTOOL_VERSION_INFO)
GOBJECT_INTROSPECTION_CHECK([0.9.0]) dnl GOBJECT_INTROSPECTION_CHECK([0.9.0])
dnl GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) dnl GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
# Functions and headers # Functions and headers

View File

@ -209,26 +209,26 @@ TESTS_ENVIRONMENT = \
HBHEADERS="$(HBHEADERS)" \ HBHEADERS="$(HBHEADERS)" \
$(NULL) $(NULL)
-include $(INTROSPECTION_MAKEFILE) #-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS = hb-1.0.gir #INTROSPECTION_GIRS = hb-1.0.gir
INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ #INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) #INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
#
if HAVE_INTROSPECTION #if HAVE_INTROSPECTION
#
hb-1.0.gir: libharfbuzz.la #hb-1.0.gir: libharfbuzz.la
hb_1_0_gir_INCLUDES = GObject-2.0 #hb_1_0_gir_INCLUDES = GObject-2.0
hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN #hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN
hb_1_0_gir_LIBS = libharfbuzz.la #hb_1_0_gir_LIBS = libharfbuzz.la
hb_1_0_gir_FILES = $(HBHEADERS) #hb_1_0_gir_FILES = $(HBHEADERS)
#
girdir = $(datadir)/gir-1.0 #girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS) #gir_DATA = $(INTROSPECTION_GIRS)
#
typelibdir = $(libdir)/girepository-1.0 #typelibdir = $(libdir)/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) #typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
#
CLEANFILES += $(gir_DATA) $(typelib_DATA) #CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif #endif
-include $(top_srcdir)/git.mk -include $(top_srcdir)/git.mk