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

diff --git a/Makefile.am b/Makefile.am
index 5f849c4c3f..75ec2980d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +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
-SUBDIRS = intl po sigc++ boost src lib
+	$(srcdir)/acinclude.m4
+
+SUBDIRS = config 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
+	development images sourcedoc
 
-#ETAGS_ARGS = --language-force=c++
 man_MANS = lyx.1
 
 ## Needed by bindist
@@ -22,22 +25,20 @@ lyx.1:
 	cp -p $(srcdir)/lyx.man lyx.1
 
 dist-hook:
-	cd $(distdir) ; rm -rf `find config -name \*CVS\*` ; \
+	cd $(distdir) ; \
 	rm -rf `find development -name \*CVS\*` ; \
-	rm -rf `find forms -name \*CVS\*` ; \
 	rm -rf `find images -name \*CVS\*`
 
 rpmdist: dist
 	ln -s lib/images/lyx.xpm . ; \
-	rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; saved_status=$$?; \
+	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 
+	fi
 	$(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
 	(cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
 	rm -rf $(bindistdir)
@@ -47,7 +48,7 @@ bindist:
 	  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  
+	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."
@@ -57,10 +58,6 @@ 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)/*