X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=2f77f41a6fa1e720d1a0e48b470ee3f660b26d9c;hb=4c6e0fe4226ce3b55d13726977f1e579f17c2ad1;hp=60f348f3b416685a4fc3a45c48fc321c29fd909e;hpb=5860b2930cffdf6d76f16f4622b34fd8767408d0;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index 60f348f3b4..2f77f41a6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,24 @@
 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
+DISTCLEANFILES += lyx.1 config.status config.cache config.log
 
 MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
-	$(srcdir)/configure $(srcdir)/development/lyx.spec \
+	$(srcdir)/configure \
 	$(srcdir)/acinclude.m4
 
-SUBDIRS = config intl po sigc++ boost src lib
+DIST_SUBDIRS = config development intl po boost src sourcedoc lib
+
+if USE_INCLUDED_BOOST
+SUBDIRS = config development intl po boost src sourcedoc lib
+else
+SUBDIRS = config development intl po src sourcedoc lib
+endif
 
 EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man acconfig.h autogen.sh \
-	development images sourcedoc
+	UPGRADING lyx.man autogen.sh images
+
+# Hack so that the targets that use tar will also work with automake 1.4
+AMTAR ?= $(TAR)
 
 man_MANS = lyx.1
 
@@ -26,35 +31,19 @@ lyx.1:
 
 dist-hook:
 	cd $(distdir) ; \
-	rm -rf `find development -name \*CVS\*` ; \
 	rm -rf `find images -name \*CVS\*`
 
 rpmdist: dist
-	ln -s lib/images/lyx.xpm . ; \
-	rpm -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+	ln -s $(srcdir)/lib/images/lyx.xpm . ; \
+	if [ -z "`type -path rpmbuild`" ]; \
+	then \
+		RPMBUILD=rpm; \
+	else \
+		RPMBUILD=rpmbuild; \
+	fi; $$RPMBUILD -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?" ; \
-	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."
-
-
-newbindist:
 	rm -f $(bindistfile)
 	$(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(bindistdir) install-strip
 	if test -f $(top_srcdir)/README.bin ; then \
@@ -64,7 +53,7 @@ newbindist:
 	(cd $(bindistdir)$(prefix) ; $(AMTAR) cf - . ) | \
 	GZIP=$(GZIP_ENV) gzip > $(bindistfile)
 	-chmod -R a+w $(bindistdir) > /dev/null 2>&1 ; rm -rf $(bindistdir)
-	@if test -f README.bin ; then \
+	@if test -f $(top_srcdir)/README.bin ; then \
 	  echo "*** Did you remember to check the contents of README.bin?" ; \
 	else \
 	  echo "*** WARNING: You did not provide a README.bin file." ; \
@@ -75,12 +64,10 @@ newbindist:
 	@echo "*** distribution and refer to *you* in case of problem."
 	@echo "*** $(bindistfile) has been created."
 
-
-doxydoc: sourcedoc/Doxyfile
-	cd sourcedoc; \
-	doxygen ./Doxyfile
+doxydoc:
+	cd sourcedoc; make doxydoc
 
 lgbtags:
 	etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
-.PHONY: sourcedoc
+.PHONY: doxydoc