merge GuiBC<.,.> into Qt2BC

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 11db973d923d1756f95fc149c0ac40e34d89fdbd..686b4d31feffeebe3532a86b6393aa151e752719 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,29 @@
 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 \
-       $(srcdir)/acinclude.m4
+       $(srcdir)/configure
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
 if USE_INCLUDED_BOOST
-SUBDIRS = m4 config development intl po boost src sourcedoc lib
-else
-SUBDIRS = m4 config development intl po src sourcedoc lib
+BOOST = boost
 endif
 
-EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING lyx.man autogen.sh
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+       $(CLIENT) src/tex2lyx
 
-# Hack so that the targets that use tar will also work with automake 1.4
-AMTAR ?= $(TAR)
+
+EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+       README.Win32 README.Cygwin lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -26,51 +31,18 @@ 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
 
 rpmdist: dist
-       $(LN_S) $(srcdir)/lib/images/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.xpm; exit $$saved_status
+       rm lyx.png; exit $$saved_status
 
 bindist:
        rm -f $(bindistfile)
@@ -101,4 +73,3 @@ lgbtags:
 
 .PHONY: doxydoc
 
-ACLOCAL_AMFLAGS = -I m4