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 2c155a9ea93bb64dcfde2f23692792a9ec4ad810..88a42a342787e90fb9996ba0ac72194314c8aa82 100644 (file)
--- a/src/frontends/Makefile.am
+++ b/src/frontends/Makefile.am
@@ -1,47 +1,45 @@
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-# xforms has to be fixed here as we still need object files in this directory
-# for the compilation of other frontends, so until that we have to let this
-# here.
-SUBDIRS = support controllers xforms @FRONTEND@
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = ${FRONTEND_INCLUDES} -I${srcdir}/.. -I${srcdir}/xforms ${SIGC_CFLAGS} $(BOOST_INCLUDES)
-LIBS =
-noinst_LTLIBRARIES = libfrontends.o
+include $(top_srcdir)/config/common.am
 
-libfrontends_o_LIBADD= \
-       xforms/*.lo \
-       controllers/*.lo \
-       support/libfrontendsupport.o
+SUBDIRS = controllers $(FRONTENDS_SUBDIRS)
 
-libfrontends_o_DEPENDENCIES = \
-       xforms/*.lo \
-       controllers/*.lo \
-       support/libfrontendsupport.o
+DIST_SUBDIRS = controllers xforms qt2 gtk
 
-libfrontends_o_SOURCES=\
+EXTRA_DIST = pch.h
+
+BUILT_SOURCES = $(PCH_FILE)
+
+noinst_LTLIBRARIES = libfrontends.la
+
+AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/..  $(BOOST_INCLUDES)
+
+libfrontends_la_SOURCES = \
        Alert.C \
        Alert.h \
        Alert_pimpl.h \
        Dialogs.C \
        Dialogs.h \
-       DialogBase.h \
        FileDialog.h \
-       GUIRunTime.h \
-       Liason.C \
-       Liason.h \
-       Menubar.C \
+       LyXKeySym.h \
+       LyXKeySymFactory.h \
+       LyXScreenFactory.h \
+       LyXView.C \
+       LyXView.h \
        Menubar.h \
+       Painter.C \
+       Painter.h \
        Timeout.C \
        Timeout.h \
-       Toolbar.C \
-       Toolbar.h
-
-EXTRA_DIST = qt2 gnome
-
-dist-hook:
-       @cd $(distdir) ; \
-       rm -rf `find qt2 -name \*CVS\*`; \
-       rm -rf `find gnome -name \*CVS\*`
+       Toolbars.C \
+       Toolbars.h \
+       WorkArea.h \
+       WorkAreaFactory.h \
+       font_metrics.h \
+       guiapi.h \
+       guiapi.C \
+       key_state.h \
+       lyx_gui.h \
+       mouse_state.h \
+       nullpainter.C \
+       nullpainter.h \
+       screen.C \
+       screen.h