fix compilation; remove cruft in configure script (I may have removed too much, but...

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7ff2005daf1637ed7bc741517fa8fb6d5242fa57..fbe291842ecb6366a99780569cadd80dc849f50b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,70 @@
-AUTOMAKE_OPTIONS = foreign
-DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
-       development/lyx.spec
-SUBDIRS = intl po src lib
-
-EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING lyx.man acconfig.h \
-       config development forms images
-ETAGS_ARGS = --c++
+include $(top_srcdir)/config/common.am
+
+DISTCLEANFILES += lyx.1 config.status config.cache config.log \
+       $(srcdir)/sourcedoc/*~ $(srcdir)/sourcedoc/Doxyfile
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
+       $(srcdir)/configure $(srcdir)/development/lyx.spec \
+       $(srcdir)/acinclude.m4
+
+SUBDIRS = config intl po boost src lib
+
+EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
+       UPGRADING lyx.man acconfig.h autogen.sh \
+       development images sourcedoc
+
+# Hack so that the targets that use tar will also work with automake 1.4
+AMTAR ?= $(TAR)
+
 man_MANS = lyx.1
+
+## Needed by bindist
+bindistdir=$(PWD)/lyxbin
+bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
+
 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 images/lyx.xpm . ; \
-       rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
-       rm lyx.xpm
+       ln -s lib/images/lyx.xpm . ; \
+       rpm -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+       rm lyx.xpm; exit $$saved_status
+
+bindist:
+       rm -f $(bindistfile)
+       $(MAKE) $(AM_MAKEFLAGS) DESTDIR=$(bindistdir) install-strip
+       if test -f $(top_srcdir)/README.bin ; then \
+         $(INSTALL) $(top_srcdir)/README.bin \
+               $(bindistdir)$(prefix)/README.bin ; \
+       fi
+       (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 $(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." ; \
+         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."
+
+doxydoc: sourcedoc/Doxyfile
+       cd sourcedoc; \
+       doxygen ./Doxyfile
+
+distclean-local:
+       rm -rf $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \
+       $(srcdir)/sourcedoc/main
+
+lgbtags:
+       etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
 
+.PHONY: sourcedoc