X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=a617a46aac2d5fd9f4dafb9c8fef5ec17c5994bf;hb=16fc9cb4d614f1e23ca5dc6443b243c9f22453c3;hp=9f42c27ff7c7f9b8be88bdcb2b2641eeedce9cfb;hpb=be60d7c965a2da8360c28357ff4b1c3aeca711f4;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 9f42c27ff7..a617a46aac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
 include $(top_srcdir)/config/common.am
 
+ACLOCAL_AMFLAGS = -I m4 -I config
+
 DISTCLEANFILES += lyx.1 config.status config.cache config.log
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-	$(srcdir)/configure \
-	$(srcdir)/acinclude.m4
+	$(srcdir)/configure
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
@@ -15,7 +16,7 @@ SUBDIRS = config development intl po src sourcedoc lib
 endif
 
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
-	INSTALL.Win32 INSTALL.MacOSX README.Win32 \
+	INSTALL.Win32 INSTALL.MacOSX INSTALL.scons README.Win32 README.Cygwin \
 	lyx.man autogen.sh
 
 man_MANS = lyx.1
@@ -24,40 +25,6 @@ man_MANS = lyx.1
 bindistdir=$(PWD)/lyxbin
 bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 
-dist_noinst_DATA = \
-	images/ChangeLog \
-	images/README \
-	images/ams_arrows.xbm \
-	images/ams_misc.xbm \
-	images/ams_nrel.xbm \
-	images/ams_ops.xbm \
-	images/ams_rel.xbm \
-	images/arrows.xbm \
-	images/bop.xbm \
-	images/brel.xbm \
-	images/deco.xbm \
-	images/deco.xpm \
-	images/delim.xbm \
-	images/delim.xpm \
-	images/delim0.xpm \
-	images/delim1.xpm \
-	images/dots.xbm \
-	images/equation.xpm \
-	images/font.xbm \
-	images/font.xpm \
-	images/frac.xpm \
-	images/greek.xbm \
-	images/matrix.xpm \
-	images/misc.xbm \
-	images/smallcaps.xpm \
-	images/space.xpm \
-	images/sqrt.xpm \
-	images/style.xbm \
-	images/style.xpm \
-	images/sub.xpm \
-	images/super.xpm \
-	images/varsz.xbm
-
 lyx.1:
 	cp -p $(srcdir)/lyx.man lyx.1
 
@@ -100,4 +67,3 @@ lgbtags:
 
 .PHONY: doxydoc
 
-ACLOCAL_AMFLAGS = -I m4