Sort and format comments

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 31a18b010a64bed1a07bb6a277fb41671f899f5c..bfccb7985b9ad57987191c7316dc0fed1a74e83c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,63 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
-       development/lyx.spec po/POTFILES.in
-SUBDIRS = intl po src lib
-
-EXTRA_DIST = ANNOUNCE CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING WHATSNEW acconfig.h 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 = 3rdparty autotests m4 config development po src sourcedoc lib
+
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
+
+SUBDIRS = autotests config development po 3rdparty src sourcedoc lib \
+       $(CLIENT) src/tex2lyx src/convert
+
+
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.cmake \
+       INSTALL.Cygwin README.localization lyx.1in \
+       autogen.sh CMakeLists.txt po/CMakeLists.txt
+
 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\*`
+# Set high compression level for xz distribution
+export XZ_OPT=-9ev
 
 rpmdist: dist
-       ln -s images/lyx.xpm . ; \
-       rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
-       rm lyx.xpm
\ No newline at end of file
+       $(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: $(srcdir)/lib/doc/LFUNs.lyx
+
+$(srcdir)/lib/doc/LFUNs.lyx: $(srcdir)/development/tools/gen_lfuns.py $(srcdir)/src/LyXAction.cpp
+       $(AM_V_GEN)$(PYTHON) $^ >$@ 2>/dev/null
+
+keystest:
+       development/keystest/lyx_make.sh
+
+alltests: check alltests-recursive
+
+alltests-recursive:
+       cd lib; $(MAKE) alltests-recursive
+       cd src; $(MAKE) alltests-recursive
+
+updatetests:
+       cd src; $(MAKE) updatetests
+
+lgbtags:
+       etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
+
+.PHONY: doxydoc alltests alltests-recursive updatetests
+