From bd2626d4b5a4c47d5a8234b55934597bf67d17e1 Mon Sep 17 00:00:00 2001 From: LAN-TW Date: Mon, 14 Apr 2014 01:28:44 +0800 Subject: [PATCH] Remove gobject-introspection --- configure.ac | 6 ------ gdk/Makefile.am | 8 -------- gtk/Makefile.am | 8 -------- 3 files changed, 22 deletions(-) diff --git a/configure.ac b/configure.ac index b4a9487..6952ca9 100644 --- a/configure.ac +++ b/configure.ac @@ -1613,12 +1613,6 @@ fi GLIB_GSETTINGS ################################################## -# GObject introspection -################################################## - -GOBJECT_INTROSPECTION_CHECK(introspection_required_version) - -################################################## # colord module ################################################# diff --git a/gdk/Makefile.am b/gdk/Makefile.am index ed4540c..340db4f 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -1,6 +1,5 @@ ## Makefile.am for gtk+/gdk include $(top_srcdir)/Makefile.decl --include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ENV = \ CC="$(CC)" @@ -193,7 +192,6 @@ if USE_WAYLAND libgdk_3_la_LIBADD += wayland/libgdk-wayland.la endif -if HAVE_INTROSPECTION introspection_files = \ $(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources)) \ @@ -322,15 +320,9 @@ INTROSPECTION_GIRS += GdkWin32-3.0.gir endif # OS_WIN32 -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif # HAVE_INTROSPECTION if OS_WIN32 install-def-file: gdk.def diff --git a/gtk/Makefile.am b/gtk/Makefile.am index c281666..4ae62e8 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,6 +1,5 @@ # Makefile.am for gtk+/gtk include $(top_srcdir)/Makefile.decl --include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ENV = \ CC="$(CC)" @@ -1344,7 +1343,6 @@ LDADDS = \ $(top_builddir)/gdk/libgdk-3.la \ $(GTK_DEP_LIBS) -if HAVE_INTROSPECTION # The Quartz clipboard and dnd files aren't annotated for # introspection. Rather than copy the annotations over from the # regular files, exclude the quartz ones: @@ -1387,14 +1385,8 @@ Gtk_3_0_gir_FILES = $(introspection_files) Gtk_3_0_gir_EXPORT_PACKAGES = gtk+-3.0 INTROSPECTION_GIRS += Gtk-3.0.gir -girdir = $(datadir)/gir-1.0 -gir_DATA = $(INTROSPECTION_GIRS) - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelibs_DATA) -endif # # Installed tools -- 1.9.2