Small fixes to compile with compaq cxx

[lyx.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8d1f2c4cc774eea9a5a94949dcf72bd2d23c5c22..698ec378d281f8805e2e0993721238f2173ce7d8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,26 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure
-SUBDIRS = intl po src lib
-EXTRA_DIST = ANNOUNCE CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \
-       UPGRADING WHATSNEW acconfig.h lyx.man \
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \
+       $(srcdir)/configure $(srcdir)/development/lyx.spec \
+       $(srcdir)/acinclude.m4
+SUBDIRS = intl po sigc++ 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++
+ETAGS_ARGS = --lang=c++
 man_MANS = lyx.1
 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 ${PACKAGE}-${VERSION}.tar.gz ; \
+       rm lyx.xpm
+