Minor language changes only

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1a1863d5b2f4125951af7c1647e645ab16a84172..a617a46aac2d5fd9f4dafb9c8fef5ec17c5994bf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,69 @@
-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 CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING WHATSNEW acconfig.h lyx.man \
-       config development forms images
-ETAGS_ARGS = --c++
+include $(top_srcdir)/config/common.am
+
+ACLOCAL_AMFLAGS = -I m4 -I config
+
+DISTCLEANFILES += lyx.1 config.status config.cache config.log
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
+       $(srcdir)/configure
+
+DIST_SUBDIRS = m4 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.autoconf RELEASE-NOTES UPGRADING \
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons README.Win32 README.Cygwin \
+       lyx.man autogen.sh
+
 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\*` ; \
-       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 lyx-1.1.1.tar.gz ; \
-       rm lyx.xpm
\ No newline at end of file
+       $(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:
+       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:
+       cd sourcedoc; make doxydoc
+
+lgbtags:
+       etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
+
+.PHONY: doxydoc
+