Pointless third arg to nextBreakPoint

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fbe291842ecb6366a99780569cadd80dc849f50b..5eaf4efa2103720fbc87d12934d001fb83deb8bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,15 @@
 include $(top_srcdir)/config/common.am
 
-DISTCLEANFILES += lyx.1 config.status config.cache config.log \
-       $(srcdir)/sourcedoc/*~ $(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 boost src lib
+SUBDIRS = config development intl po boost src sourcedoc lib
 
 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)
@@ -27,12 +25,16 @@ 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:
@@ -56,15 +58,10 @@ bindist:
        @echo "*** distribution and refer to *you* in case of problem."
        @echo "*** $(bindistfile) has been created."
 
-doxydoc: sourcedoc/Doxyfile
-       cd sourcedoc; \
-       doxygen ./Doxyfile
-
-distclean-local:
-       rm -rf $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
-       $(srcdir)/sourcedoc/main
+doxydoc:
+       cd sourcedoc; make doxydoc
 
 lgbtags:
        etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
-.PHONY: sourcedoc
+.PHONY: doxydoc