fix crash due to invalidated iterator

[lyx.git] / src / frontends / Makefile.am

diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am
index 123095ea8628312c5bfa8a792ab1ca55c81c9477..88a42a342787e90fb9996ba0ac72194314c8aa82 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -1,17 +1,16 @@
 include $(top_srcdir)/config/common.am
 
-SUBDIRS = controllers $(FRONTEND)
+SUBDIRS = controllers $(FRONTENDS_SUBDIRS)
 
-DIST_SUBDIRS = controllers xforms qt2 gnome
+DIST_SUBDIRS = controllers xforms qt2 gtk
 
-noinst_LTLIBRARIES = libfrontends.la
+EXTRA_DIST = pch.h
 
-INCLUDES = $(FRONTEND_INCLUDES) -I$(srcdir)/..  $(BOOST_INCLUDES)
+BUILT_SOURCES = $(PCH_FILE)
 
-libfrontends_la_LDFLAGS = $(FRONTEND_LDFLAGS) $(FRONTEND_LIBS)
-libfrontends_la_LIBADD = $(FRONTEND_GUILIB) controllers/*.lo
+noinst_LTLIBRARIES = libfrontends.la
 
-libfrontends_la_DEPENDENCIES = $(libfrontends_la_LIBADD)
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/..  $(BOOST_INCLUDES)
 
 libfrontends_la_SOURCES = \
        Alert.C \
@@ -25,15 +24,13 @@ libfrontends_la_SOURCES = \
        LyXScreenFactory.h \
        LyXView.C \
        LyXView.h \
-       Menubar.C \
        Menubar.h \
        Painter.C \
        Painter.h \
        Timeout.C \
        Timeout.h \
-       Toolbar.C \
-       Toolbar.h \
-       WorkArea.C \
+       Toolbars.C \
+       Toolbars.h \
        WorkArea.h \
        WorkAreaFactory.h \
        font_metrics.h \
@@ -42,5 +39,7 @@ libfrontends_la_SOURCES = \
        key_state.h \
        lyx_gui.h \
        mouse_state.h \
+       nullpainter.C \
+       nullpainter.h \
        screen.C \
        screen.h