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

[lyx.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5cc4faa487ed761bcd344341bd8565ea9dc3856a..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@ @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 = \
@@ -64,7 +68,6 @@ lyx_SOURCES = \
        LyXAction.h \
        LyXView.C \
        LyXView.h \
-       Makefile.in \
        MenuBackend.C \
        MenuBackend.h \
        Painter.C \