X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=7237120f7df97d333a5fa6d2397b292d533bfc6d;hb=8e988ba702af5562d3b6c06ff6ea49e59eb8e4e2;hp=09646164304ca0411df73846272b740a5eb8ed2c;hpb=0aab8ead34b4128c27e5452294fc08810d658364;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 0964616430..7237120f7d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,29 @@
 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 BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
 if USE_INCLUDED_BOOST
-SUBDIRS = config development intl po boost src sourcedoc lib
-else
-SUBDIRS = config development intl po src sourcedoc lib
+BOOST = boost
 endif
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf INSTALL.Win32 README.OS2 \
-	README.Win32 UPGRADING lyx.man autogen.sh
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+	$(CLIENT) src/tex2lyx
+
+
+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
 
@@ -23,39 +31,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
 
@@ -98,4 +73,3 @@ lgbtags:
 
 .PHONY: doxydoc
 
-ACLOCAL_AMFLAGS = -I m4