From de616e362ccd56aae8b26a08d9520ab9132a060f Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 9 Jul 2013 17:18:22 +0200 Subject: fixed compilation of the GTK+ interface * there was a compile-time race condition that could result in the GObjects not being built (with Gob2). So I removed the symbols generation from BUILT_SOURCES. * apparently either Scintilla depends on gmodule since I last tested or the gtk+-2.0 pkg-config package no longer includes gmodule, so we must explicitly depend on it --- configure.ac | 2 +- src/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 07044b1..491217b 100644 --- a/configure.ac +++ b/configure.ac @@ -144,7 +144,7 @@ case $INTERFACE in ;; gtk) - PKG_CHECK_MODULES(LIBGTK, [gtk+-2.0], [ + PKG_CHECK_MODULES(LIBGTK, [gtk+-2.0 gmodule-2.0], [ CFLAGS="$CFLAGS $LIBGTK_CFLAGS" CXXFLAGS="$CXXFLAGS $LIBGTK_CFLAGS" LIBS="$LIBS $LIBGTK_LIBS" diff --git a/src/Makefile.am b/src/Makefile.am index d068856..93de359 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ if NEED_COMPAT AM_CPPFLAGS += -I@top_srcdir@/compat endif -BUILT_SOURCES = symbols-scintilla.cpp symbols-scilexer.cpp +BUILT_SOURCES = EXTRA_DIST = gtk-info-popup.gob \ symbols-extract.tes -- cgit v1.2.3