X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=779d32173cd4f489676c484d83290d2841779e7c;hb=34889ec7b3f7a0bd523983c6359ccc8a4832bb57;hp=c345445fd3c87501d939516b53acb3bebbe59774;hpb=f2a5086aef76a86fedf7d1ec966d0b46a98b447d;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index c345445fd3..779d32173c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +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
+BOOST = boost
+endif
 
-SUBDIRS = config development intl po boost src sourcedoc lib
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+	$(CLIENT) src/tex2lyx
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man autogen.sh images
 
-# 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 README.localization lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -23,14 +34,15 @@ bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 lyx.1:
 	cp -p $(srcdir)/lyx.man lyx.1
 
-dist-hook:
-	cd $(distdir) ; \
-	rm -rf `find images -name \*CVS\*`
-
 rpmdist: dist
-	ln -s lib/images/lyx.xpm . ; \
-	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
-	rm lyx.xpm; exit $$saved_status
+	$(LN_S) $(srcdir)/lib/images/lyx.png . ; \
+	if [ -z "`type -path rpmbuild`" ]; \
+	then \
+		RPMBUILD=rpm; \
+	else \
+		RPMBUILD=rpmbuild; \
+	fi; $$RPMBUILD -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+	rm lyx.png; exit $$saved_status
 
 bindist:
 	rm -f $(bindistfile)
@@ -60,3 +72,4 @@ lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
 .PHONY: doxydoc
+