X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=59842adfeb178316a88ea13922e79b502c066100;hb=1feaf6c814a239645449ac1ffebe35f4edf85fe0;hp=11db973d923d1756f95fc149c0ac40e34d89fdbd;hpb=5af062b550205f209a541fddd7c17dedc8715466;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 11db973d92..59842adfeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,23 @@
 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
 
 if USE_INCLUDED_BOOST
-SUBDIRS = m4 config development intl po boost src sourcedoc lib
+SUBDIRS = config development intl po boost src sourcedoc lib
 else
-SUBDIRS = m4 config development intl po src sourcedoc lib
+SUBDIRS = config development intl po src sourcedoc lib
 endif
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man autogen.sh
-
-# Hack so that the targets that use tar will also work with automake 1.4
-AMTAR ?= $(TAR)
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+	INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+	README.Win32 README.Cygwin lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -26,39 +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/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
 
@@ -101,4 +67,3 @@ lgbtags:
 
 .PHONY: doxydoc
 
-ACLOCAL_AMFLAGS = -I m4