External inset debug cleanup + various patches from Dekel

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1a91f23108e9fa05a9a1f3134e36fcabbad3efa..2f016bb9c0453d04d83c1f06d04a6ed0d7e9808a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,20 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure \
-       development/lyx.spec
-SUBDIRS = intl po src lib
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
+       $(srcdir)/configure $(srcdir)/development/lyx.spec \
+       $(srcdir)/acinclude.m4
+SUBDIRS = intl po sigc++ boost src lib
 
 EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING NEWS acconfig.h lyx.man \
+       UPGRADING lyx.man acconfig.h \
        config development forms images
-ETAGS_ARGS = --c++
+ETAGS_ARGS = --lang=c++
 man_MANS = lyx.1
+
+## Needed by bindist
+bindistdir=lyxbin
+bindistfile=$(PACKAGE)-$(VERSION)-bin.tar.gz
+
 lyx.1:
        cp -p $(srcdir)/lyx.man lyx.1
 
@@ -19,6 +25,35 @@ dist-hook:
        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:
+       mkdir $(bindistdir)
+       if test -f README.bin ; then \
+         $(INSTALL) README.bin  $(bindistdir)/README.bin ; \
+       fi 
+       $(MAKE) $(AM_MAKEFLAGS) install-strip prefix=`pwd`/$(bindistdir)
+       (cd $(bindistdir) ; tar cf - .) | gzip >$(bindistfile)
+       rm -rf $(bindistdir)
+       @if test -f 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."
+
+
+sourcedoc:
+       mkdir sourcedoc
+       cd sourcedoc ; \
+       doc++ -p `find ../$(top_srcdir)/src -name \*.h`
+
+lgbtags:
+       etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*