X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=49054584cb64938b3d1095de38015571c315f313;hb=3c851f1f7951f3a24b57826f3e580e4318b5e6c4;hp=e675a7f4c5e049104c53e44b2b83ba5d810b7ced;hpb=ac94b18044b35dccf94cc015dbce30c0d05f2f7e;p=lyx.git

diff --git a/Makefile.am b/Makefile.am
index e675a7f4c5..49054584cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,21 @@
 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)/acinclude.m4
 
-SUBDIRS = config development intl po boost src lib
+DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-	UPGRADING lyx.man autogen.sh \
-	images sourcedoc
+if USE_INCLUDED_BOOST
+SUBDIRS = config development intl po boost src sourcedoc lib
+else
+SUBDIRS = config development intl po src sourcedoc lib
+endif
 
-# Hack so that the targets that use tar will also work with automake 1.4
-AMTAR ?= $(TAR)
+EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
+	UPGRADING lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -22,16 +23,50 @@ man_MANS = lyx.1
 bindistdir=$(PWD)/lyxbin
 bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
 
+dist_noinst_DATA = \
+	images/ChangeLog \
+	images/README \
+	images/ams_arrows.xbm \
+	images/ams_misc.xbm \
+	images/ams_nrel.xbm \
+	images/ams_ops.xbm \
+	images/ams_rel.xbm \
+	images/arrows.xbm \
+	images/bop.xbm \
+	images/brel.xbm \
+	images/deco.xbm \
+	images/deco.xpm \
+	images/delim.xbm \
+	images/delim.xpm \
+	images/delim0.xpm \
+	images/delim1.xpm \
+	images/dots.xbm \
+	images/equation.xpm \
+	images/font.xbm \
+	images/frac.xpm \
+	images/greek.xbm \
+	images/matrix.xpm \
+	images/misc.xbm \
+	images/smallcaps.xpm \
+	images/space.xpm \
+	images/sqrt.xpm \
+	images/style.xbm \
+	images/style.xpm \
+	images/sub.xpm \
+	images/super.xpm \
+	images/varsz.xbm
+
 lyx.1:
 	cp -p $(srcdir)/lyx.man lyx.1
 
-dist-hook:
-	cd $(distdir) ; \
-	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:
@@ -55,15 +90,12 @@ 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
+
+ACLOCAL_AMFLAGS = -I m4