update german examples (from Hartmut Haase)

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a06fe358e684beede5dcc682ccf0ffc8759831b..da38c190ace105da0cba93e0f9c4de00c400d725 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,17 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
        $(srcdir)/configure \
        $(srcdir)/acinclude.m4
 
-SUBDIRS = config development intl po boost src sourcedoc 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
+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 INSTALL.Win32 \
+       INSTALL.MacOSX README.OS2 README.Win32 \
+       UPGRADING lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -20,16 +24,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 . ; \
-       rpmbuild -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:
@@ -53,15 +91,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