X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=bfccb7985b9ad57987191c7316dc0fed1a74e83c;hb=28f81d1be5e769e2996cc1a6189ce297fa4caa6c;hp=5f849c4c3f90c441073dc4afd3872362698d7ff3;hpb=c130d5dbfd3f4d4a2721c9be786b7fa45b806aca;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 5f849c4c3f..bfccb7985b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,67 +1,63 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core $(srcdir)/sourcedoc/*~ \
-	$(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
-	$(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
-	$(srcdir)/configure $(srcdir)/development/lyx.spec \
-	$(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
-SUBDIRS = intl po sigc++ boost src lib
-
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man acconfig.h autogen.sh \
-	config development forms images sourcedoc
-
-#ETAGS_ARGS = --language-force=c++
-man_MANS = lyx.1
+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
 
-## Needed by bindist
-bindistdir=lyxbin
-bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 
-lyx.1:
-	cp -p $(srcdir)/lyx.man lyx.1
+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
 
-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\*`
+man_MANS = lyx.1
+
+# Set high compression level for xz distribution
+export XZ_OPT=-9ev
 
 rpmdist: dist
-	ln -s lib/images/lyx.xpm . ; \
-	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; saved_status=$$?; \
-	rm lyx.xpm; exit $$saved_status
-
-
-bindist:
-	mkdir $(bindistdir)
-	if test -f README.bin ; then \
-	  $(INSTALL) README.bin  $(bindistdir)/README.bin ; \
-	fi 
-	$(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
-	(cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
-	rm -rf $(bindistdir)
-	@if test -f README.bin ; then \
-	  echo "*** Did you remember to check the contents of README.bin?" ; \
+	$(LN_S) $(srcdir)/lib/images/lyx.png . ; \
+	if [ -z "`type -path rpmbuild`" ]; \
+	then \
+		RPMBUILD=rpm; \
 	else \
-	  echo "*** WARNING: You did not provide a README.bin file." ; \
-	  echo "*** Please make one now from the example file" ; \
-	  echo "***   development/tools/README.bin.example" ; \
-	fi  
-	@echo "*** It should mention any problem concerning your binary"
-	@echo "*** distribution and refer to *you* in case of problem."
-	@echo "*** $(bindistfile) has been created."
+		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
 
-doxydoc: sourcedoc/Doxyfile
-	cd sourcedoc; \
-	doxygen ./Doxyfile
+keystest:
+	development/keystest/lyx_make.sh
 
-sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+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: sourcedoc
+.PHONY: doxydoc alltests alltests-recursive updatetests
+