X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8fb666f401c094d3c8cc5f5e13244228f76df01d;hb=0899e957c39a0d7157a809059afb08389f205d2d;hp=164a9468ec7f89cb25950b41af8ff8d8cd3427cd;hpb=ec64f0ded69098db1398717201553c97af675a8c;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 164a9468ec..8fb666f401 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,59 +1,61 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
-	$(srcdir)/configure $(srcdir)/development/lyx.spec \
-	$(srcdir)/acinclude.m4
-SUBDIRS = intl po sigc++ boost src lib
-
-EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man acconfig.h autogen.sh \
-	config development forms images
-ETAGS_ARGS = --lang=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 = m4 config development intl po boost src sourcedoc lib
+
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
+if USE_INCLUDED_BOOST
+BOOST = boost
+endif
 
-## Needed by bindist
-bindistdir=lyxbin
-bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+	$(CLIENT) src/tex2lyx
 
-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\*`
+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
+
+#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 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
 
-sourcedoc:
-	mkdir sourcedoc
-	cd sourcedoc ; \
-	doc++ -p `find ../$(top_srcdir)/src -name \*.h`
+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
+