It would be nice if people could check that this works with automake
older than 1.8.3 and 1.7.8. I have tested those with distcheck.
(Or do we now require automake > 1.7?) (what version of automake is in
RH9?)
Index: Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/Makefile.am,v
retrieving revision 1.47
diff -u -p -b -r1.47 Makefile.am
--- Makefile.am 26 May 2004 20:26:09 -0000 1.47
+++ Makefile.am 8 Jun 2004 17:39:49 -0000
@@ -15,7 +15,7 @@ SUBDIRS = m4 config development intl po
endif
EXTRA_DIST = ANNOUNCE INSTALL.OS2 INSTALL.autoconf README.OS2 \
- UPGRADING lyx.man autogen.sh images
+ UPGRADING lyx.man autogen.sh
# Hack so that the targets that use tar will also work with automake 1.4
AMTAR ?= $(TAR)
@@ -26,15 +26,44 @@ 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
-dist-hook:
- cd $(distdir) ; \
- rm -rf `find images -name \*CVS\*`
-
rpmdist: dist
- ln -s $(srcdir)/lib/images/lyx.xpm . ; \
+ $(LN_S) $(srcdir)/lib/images/lyx.xpm . ; \
if [ -z "`type -path rpmbuild`" ]; \
then \
RPMBUILD=rpm; \
Index: lib/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/Makefile.am,v
retrieving revision 1.57
diff -u -p -b -r1.57 Makefile.am
--- lib/Makefile.am 2 Jun 2004 18:48:12 -0000 1.57
+++ lib/Makefile.am 8 Jun 2004 17:39:49 -0000
@@ -6,33 +6,18 @@ SUBDIRS = doc reLyX
EXTRA_DIST = \
configure.m4 \
- chkconfig.ltx \
- $(pkgdata_DATA) \
- $(pkgdata_SCRIPTS) \
- $(bind_DATA) \
- $(clipart_DATA) \
- $(examples_DATA) \
- $(images_DATA) \
- $(imagesmath_DATA) \
- $(kbd_DATA) \
- $(layouts_DATA) \
- $(lyx2lyx_DATA) \
- $(lyx2lyx_SCRIPTS) \
- $(scripts_SCRIPTS) \
- $(templates_DATA) \
- $(tex_DATA) \
- $(ui_DATA)
+ chkconfig.ltx
CHMOD = chmod
-pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
+dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
textclass.lst packages.lst external_templates \
encodings languages symbols
-pkgdata_SCRIPTS = configure configure.cmd
+dist_pkgdata_SCRIPTS = configure configure.cmd
binddir = $(pkgdatadir)/bind
-bind_DATA = \
+dist_bind_DATA = \
bind/broadway.bind \
bind/cua.bind \
bind/cyrkeys.bind \
@@ -51,10 +36,10 @@ bind_DATA = \
bind/aqua.bind
clipartdir = $(pkgdatadir)/clipart
-clipart_DATA = clipart/platypus.eps
+dist_clipart_DATA = clipart/platypus.eps
examplesdir = $(pkgdatadir)/examples
-examples_DATA = \
+dist_examples_DATA = \
examples/Foils.lyx \
examples/ItemizeBullets.lyx \
examples/Literate.lyx \
@@ -126,7 +111,7 @@ examples_DATA = \
examples/ro_splash.lyx
imagesdir = $(pkgdatadir)/images
-images_DATA = \
+dist_images_DATA = \
images/amssymb.xpm \
images/banner.ppm \
images/bookmark-goto.xpm \
@@ -227,7 +212,7 @@ images_DATA = \
images/url-insert.xpm
imagesmathdir = $(imagesdir)/math
-imagesmath_DATA = \
+dist_imagesmath_DATA = \
images/math/Bbbk.xpm \
images/math/Finv.xpm \
images/math/Game.xpm \
@@ -682,7 +667,7 @@ imagesmath_DATA = \
images/math/zeta.xpm
kbddir = $(pkgdatadir)/kbd
-kbd_DATA = \
+dist_kbd_DATA = \
kbd/american-2.kmap \
kbd/american.kmap \
kbd/arabic.kmap \
@@ -737,7 +722,7 @@ kbd_DATA = \
kbd/espanol.kmap
layoutsdir = $(pkgdatadir)/layouts
-layouts_DATA =\
+dist_layouts_DATA =\
layouts/IEEEtran.layout \
layouts/aa.layout \
layouts/aapaper.inc \
@@ -848,8 +833,8 @@ layouts_DATA =\
layouts/svglobal.layout
lyx2lyxdir = $(pkgdatadir)/lyx2lyx
-lyx2lyx_SCRIPTS = lyx2lyx/lyx2lyx
-lyx2lyx_DATA = \
+dist_lyx2lyx_SCRIPTS = lyx2lyx/lyx2lyx
+dist_lyx2lyx_DATA = \
lyx2lyx/lyx2lyx \
lyx2lyx/parser_tools.py \
lyx2lyx/lyx_0_12.py \
@@ -864,7 +849,7 @@ lyx2lyx_DATA = \
lyx2lyx/lyx_1_4.py
scriptsdir = $(pkgdatadir)/scripts
-scripts_SCRIPTS = \
+dist_scripts_SCRIPTS = \
scripts/TeXFiles.sh \
scripts/convertDefault.sh \
scripts/fen2ascii.py \
@@ -875,7 +860,7 @@ scripts_SCRIPTS = \
scripts/lyxpreview2bitmap.py
templatesdir = $(pkgdatadir)/templates
-templates_DATA = \
+dist_templates_DATA = \
templates/IEEEtran.lyx \
templates/README.new_templates \
templates/aa.lyx \
@@ -898,7 +883,7 @@ templates_DATA = \
templates/agu_article.lyx
texdir = $(pkgdatadir)/tex
-tex_DATA = \
+dist_tex_DATA = \
tex/broadway.cls \
tex/cv.cls \
tex/hollywood.cls \
@@ -907,7 +892,7 @@ tex_DATA = \
tex/revtex.cls
uidir = $(pkgdatadir)/ui
-ui_DATA = \
+dist_ui_DATA = \
ui/classic.ui \
ui/default.ui \
ui/stdmenus.ui \
Index: src/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Makefile.am,v
retrieving revision 1.211
diff -u -p -b -r1.211 Makefile.am
--- src/Makefile.am 3 Jun 2004 13:08:50 -0000 1.211
+++ src/Makefile.am 8 Jun 2004 17:39:49 -0000
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES += $(srcdir)/config
SUBDIRS = mathed insets graphics support frontends tex2lyx
-EXTRA_DIST = config.h.in stamp-h.in cheaders version.C.in \
+EXTRA_DIST = config.h.in stamp-h.in version.C.in \
Sectioning.h \
Sectioning.C \
Variables.C \
@@ -280,8 +280,21 @@ lyx_SOURCES = \
vspace.C \
vspace.h
-dist-hook:
- cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`
+dist_noinst_DATA = \
+ cheaders/ChangeLog \
+ cheaders/cassert \
+ cheaders/cctype \
+ cheaders/cerrno \
+ cheaders/climits \
+ cheaders/clocale \
+ cheaders/cmath \
+ cheaders/csignal \
+ cheaders/cstdarg \
+ cheaders/cstddef \
+ cheaders/cstdio \
+ cheaders/cstdlib \
+ cheaders/cstring \
+ cheaders/ctime
version.C: stamp-version
@:
--
Lgb
