X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=c31c76ceeb9db516b3543719b7960e430ae10058;hb=b97138d0e8b5f107a7eac52fcbf5ee9d9f01af0b;hp=9d24be98d16e64c03cdc9bc29db72ad6de9fd2ff;hpb=ce5660a75cfebdbbd4ad5913f871c57b2f9b1c9d;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 9d24be98d1..c31c76ceeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,20 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core $(srcdir)/sourcedoc/*~ \
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += -r lyx.1 config.status config.cache config.log \
+	$(srcdir)/sourcedoc/*~ \
 	$(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
 	$(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 	$(srcdir)/configure $(srcdir)/development/lyx.spec \
-	$(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile
+	$(srcdir)/acinclude.m4
+
 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
-ETAGS_ARGS = --lang=c++
+	config development images sourcedoc
+
 man_MANS = lyx.1
 
 ## Needed by bindist
@@ -23,7 +27,6 @@ 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
@@ -52,14 +55,10 @@ bindist:
 	@echo "*** $(bindistfile) has been created."
 
 
-sourcedoc: sourcedoc/Doxyfile
+doxydoc: sourcedoc/Doxyfile
 	cd sourcedoc; \
 	doxygen ./Doxyfile
 
-sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
 lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*