thinko

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a617a46aac2d5fd9f4dafb9c8fef5ec17c5994bf..779d32173cd4f489676c484d83290d2841779e7c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,15 +9,21 @@ MAINTAINERCLEANFILES += $(srcdir)/aclocal.m4 \
 
 DIST_SUBDIRS = m4 config development intl po boost src sourcedoc lib
 
+if BUILD_CLIENT_SUBDIR
+CLIENT = src/client
+endif
+
 if USE_INCLUDED_BOOST
-SUBDIRS = config development intl po boost src sourcedoc lib
-else
-SUBDIRS = config development intl po src sourcedoc lib
+BOOST = boost
 endif
 
+SUBDIRS = config development intl po $(BOOST) src sourcedoc lib \
+       $(CLIENT) src/tex2lyx
+
+
 EXTRA_DIST = ANNOUNCE INSTALL.autoconf RELEASE-NOTES UPGRADING \
-       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons README.Win32 README.Cygwin \
-       lyx.man autogen.sh
+       INSTALL.Win32 INSTALL.MacOSX INSTALL.scons INSTALL.cmake \
+       README.Win32 README.Cygwin README.localization lyx.man autogen.sh
 
 man_MANS = lyx.1
 
@@ -29,14 +35,14 @@ 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)