Fix deleting of paragraphs after undo (fix #236).

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 47b2abe95fed66294a7665ebec95a4b70d06c4a0..b557f1e1c8d6551bded71415c0349f1219f897aa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,11 @@
-AUTOMAKE_OPTIONS = foreign
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += config.h libintl.h
+
+MAINTAINERCLEANFILES += $(srcdir)/config.h.in
+
 SUBDIRS = mathed insets graphics support frontends
-DISTCLEANFILES= *.orig *.rej *~ *.bak core libintl.h config.h
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/config.h.in
+
 bin_PROGRAMS = lyx
 
 lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
@@ -9,10 +13,12 @@ lyx_DEPENDENCIES = mathed/libmathed.o insets/libinsets.o \
        frontends/libfrontends.o \
        support/libsupport.o \
        @INCLUDED_SIGC@
+
 lyx_LDADD = $(lyx_DEPENDENCIES) @INTLLIBS@ $(SIGC_LIBS) \
-       $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @LYX_LIBS@
+       $(PSPELL_LIBS) @AIKSAURUS_LIBS@ @FRONTEND_LDFLAGS@ @FRONTEND_LIBS@
 
 #lyx_LDFLAGS=-Wl,-O1
+
 EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        Sectioning.h \
        Sectioning.C \
@@ -20,10 +26,8 @@ EXTRA_DIST = config.h.in stamp-h.in cheaders ext_l10n.h version.C.in \
        Variables.h \
        counters.C \
        counters.h
- 
-ETAGS_ARGS = --lang=c++
-BOOST_INCLUDES = -I$(top_srcdir)/boost
-INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES) @FRONTEND_INCLUDES@
+
+INCLUDES = $(SIGC_CFLAGS) $(BOOST_INCLUDES) $(PSPELL_INCLUDES)
 localedir = $(datadir)/locale
 BUILT_SOURCES = version.C
 lyx_SOURCES = \
@@ -62,10 +66,8 @@ lyx_SOURCES = \
        Lsstream.h \
        LyXAction.C \
        LyXAction.h \
-       LyXSendto.C \
        LyXView.C \
        LyXView.h \
-       Makefile.in \
        MenuBackend.C \
        MenuBackend.h \
        Painter.C \
@@ -85,8 +87,6 @@ lyx_SOURCES = \
        Thesaurus.h \
        ToolbarDefaults.C \
        ToolbarDefaults.h \
-       UpdateInset.C \
-       UpdateInset.h \
        WorkArea.C \
        WorkArea.h \
        XFormsView.C \
@@ -114,11 +114,6 @@ lyx_SOURCES = \
        encoding.h \
        exporter.C \
        exporter.h \
-       figure.h \
-       figure_form.C \
-       figure_form.h \
-       figureForm.C \
-       figureForm.h \
        font.C \
        font.h \
        gettext.C \
@@ -144,8 +139,6 @@ lyx_SOURCES = \
        lyx_cb.h \
        lyx_gui.C \
        lyx_gui.h \
-       lyx_gui_misc.C \
-       lyx_gui_misc.h \
        lyx_main.C \
        lyx_main.h \
        lyx_sty.C \
@@ -191,8 +184,6 @@ lyx_SOURCES = \
        paragraph.h \
        paragraph_pimpl.C \
        paragraph_pimpl.h \
-       print_form.C \
-       print_form.h \
        screen.C \
        sp_base.h \
        sp_spell.C \
@@ -233,7 +224,7 @@ lyx_SOURCES = \
        vspace.h
 
 lyx_main.o: lyx_main.C lyx_main.h config.h version.h lyx_gui.h \
-       lyx_gui_misc.h lyxrc.h support/path.h support/filetools.h \
+       lyxrc.h support/path.h support/filetools.h \
        bufferlist.h debug.h support/FileInfo.h lastfiles.h intl.h \
        lyxserver.h layout.h gettext.h kbmap.h commandtags.h language.h 
        $(CXXCOMPILE) -DLYX_DIR=\"$(pkgdatadir)\" \