Fix some issues with textmode. We'll let SetMode() handle as much of

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7ff2005daf1637ed7bc741517fa8fb6d5242fa57..50977a2241d80fec4c5dc1502cbebb8e08ad6e9e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,51 @@
-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++
-man_MANS = lyx.1
-lyx.1:
-       cp -p $(srcdir)/lyx.man lyx.1
+include $(top_srcdir)/config/common.am
+
+ACLOCAL_AMFLAGS = -I m4 -I config
+
+MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 $(srcdir)/configure \
+       $(srcdir)/config.h.in
+
+DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
+
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
+if USE_INCLUDED_BOOST
+BOOST = boost
+endif
+
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+       $(CLIENT) src/tex2lyx
+
 
-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\*`
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+       README.Win32 README.Cygwin README.localization lyx.1in autogen.sh
+
+man_MANS = lyx.1
 
 rpmdist: dist
-       ln -s images/lyx.xpm . ; \
-       rpm -ta ${PACKAGE}-${VERSION}.tar.gz ; \
-       rm lyx.xpm
+       $(LN_S) $(srcdir)/lib/images/lyx.png . ; \
+       if [ -z "`type -path rpmbuild`" ]; \
+       then \
+               RPMBUILD=rpm; \
+       else \
+               RPMBUILD=rpmbuild; \
+       fi; $$RPMBUILD -ta $(PACKAGE)-$(VERSION).tar.gz ; saved_status=$$?; \
+       rm lyx.png; exit $$saved_status
+
+doxydoc:
+       cd sourcedoc; make doxydoc
+
+lfundoc:
+       development/tools/gen_lfuns.py src/LyXAction.cpp > lib/doc/LFUNs.lyx
+
+keystest:
+       development/keystest/lyx_make.sh
+
+lgbtags:
+       etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/*
+
+.PHONY: doxydoc