X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=81ee29e1f16ab2fe17f5a7a36a2b6bf2a77c3519;hb=65192703add4104267ee0ebcf9bc0ec35e4c93b6;hp=1a1863d5b2f4125951af7c1647e645ab16a84172;hpb=8729126a15cead19edbb5de951ee4f737bbea7c6;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 1a1863d5b2..81ee29e1f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,50 @@
-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 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
+
+DISTCLEANFILES += lyx.1
+
+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
+
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+	$(CLIENT) src/tex2lyx
+
+
+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
+
 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\*`
-
 rpmdist: dist
-	ln -s images/lyx.xpm . ; \
-	rpm -ta lyx-1.1.1.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
+
+lgbtags:
+	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
+
+.PHONY: doxydoc
+