X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=6df1254bd93dbfef5b399deb068225139e186aa0;hb=978ecc33092206c9d3ffcead33af5442f3370a5b;hp=dfa8b9cb328c72b5a0776504f7bda88010ffcc5d;hpb=8dccec5c46a1689fe3ea37144252e952771e1e1c;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index dfa8b9cb32..6df1254bd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,61 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
-	development/lyx.spec
-SUBDIRS = intl po src lib
-
-EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man \
-	config development forms images
-ETAGS_ARGS = --c++
+include $(top_srcdir)/config/common.am
+
+ACLOCAL_AMFLAGS = -I m4 -I config
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
+	$(srcdir)/config.h.in
+
+DIST_SUBDIRS = m4 config development po boost src sourcedoc lib
+
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
+if USE_INCLUDED_BOOST
+BOOST = boost
+endif
+
+SUBDIRS = config development po $(BOOST) src sourcedoc lib \
+	$(CLIENT) src/tex2lyx
+
+
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+	INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
+	README.Win32 README.Cygwin README.localization lyx.1in \
+	autogen.sh
+
 man_MANS = lyx.1
-lyx.1:
-	cp -p $(srcdir)/lyx.man lyx.1
 
-dist-hook:
-	cd $(distdir) ; rm -rf `find config -name \*CVS\*` ; \
-	rm -rf `find development -name \*CVS\*` ; \
-	rm -rf `find forms -name \*CVS\*` ; \
-	rm -rf `find images -name \*CVS\*`
+#Wait some time for bumping automake 1.11, which can use dist-xz
+#directly without this code, which is to be removed.
+#xz has low compression by default, but can be affected via
+#export XZ_OPT=-9ev put somewhere in the makefile.
+lyxdist: dist
+	bunzip2 $(PACKAGE)-$(VERSION).tar.bz2
+	xz -9 $(PACKAGE)-$(VERSION).tar
+	ls -hl $(PACKAGE)-$(VERSION).tar.*
 
 rpmdist: dist
-	ln -s images/lyx.xpm . ; \
-	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
-	rm lyx.xpm
+	$(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
+
+doxydoc:
+	cd sourcedoc; make doxydoc
+
+lfundoc:
+	development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx
+
+keystest:
+	development/keystest/lyx_make.sh
+
+lgbtags:
+	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
+
+.PHONY: doxydoc