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

diff --git a/Makefile.am b/Makefile.am
index d921ef3af1..779d32173c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,29 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += -r lyx.1 config.status config.cache config.log \
-	$(srcdir)/sourcedoc/*~ \
-	$(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
-	$(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
+ACLOCAL_AMFLAGS = -I m4 -I config
+
+DISTCLEANFILES += lyx.1 config.status config.cache config.log
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-	$(srcdir)/configure $(srcdir)/development/lyx.spec \
-	$(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 intl po sigc++ boost src 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 acconfig.h autogen.sh \
-	development images sourcedoc
+
+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
 
@@ -24,15 +34,15 @@ bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 lyx.1:
 	cp -p $(srcdir)/lyx.man lyx.1
 
-dist-hook:
-	cd $(distdir) ; \
-	rm -rf `find development -name \*CVS\*` ; \
-	rm -rf `find images -name \*CVS\*`
-
 rpmdist: dist
-	ln -s lib/images/lyx.xpm . ; \
-	rpm -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)
@@ -55,11 +65,11 @@ bindist:
 	@echo "*** distribution and refer to *you* in case of problem."
 	@echo "*** $(bindistfile) has been created."
 
-doxydoc: sourcedoc/Doxyfile
-	cd sourcedoc; \
-	doxygen ./Doxyfile
+doxydoc:
+	cd sourcedoc; make doxydoc
 
 lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
-.PHONY: sourcedoc
+.PHONY: doxydoc
+