From 5af062b550205f209a541fddd7c17dedc8715466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Wed, 9 Jun 2004 13:14:36 +0000 Subject: [PATCH] Further cleanup some Makefiles a bit git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8811 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 5 +++++ Makefile.am | 41 +++++++++++++++++++++++++++++++++++------ lib/ChangeLog | 5 +++++ lib/Makefile.am | 47 ++++++++++++++++------------------------------- src/ChangeLog | 5 +++++ src/Makefile.am | 19 ++++++++++++++++--- 6 files changed, 82 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index aadd65ee45..3e6b4f5682 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-06-09 Lars Gullik Bjonnes + + * Makefile.am (dist_noinst_DATA): use the dist_ and noinst_ + annotations to clean up the Makefile slightly. + 2004-06-01 Lars Gullik Bjonnes * configure.ac (AC_CONFIG_FILES): add lib/doc/Makefile diff --git a/Makefile.am b/Makefile.am index 5bd8964560..11db973d92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ SUBDIRS = m4 config development intl po src sourcedoc lib 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; \ diff --git a/lib/ChangeLog b/lib/ChangeLog index 859117aece..d63b322927 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2004-06-09 Lars Gullik Bjonnes + + * Makefile.am (dist_*): Use the dist annotation to clean up the + Makefile slightly. + 2004-06-02 Lars Gullik Bjonnes * Makefile.am (EXTRA_DIST): fix and cleanup, make sure diff --git a/lib/Makefile.am b/lib/Makefile.am index 1369e51635..3e01ce285b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -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 \ diff --git a/src/ChangeLog b/src/ChangeLog index 1f1bc12c43..5a801bab93 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-06-09 Lars Gullik Bjonnes + + * Makefile.am (dist_noinst_DATA): use the dist_ and noinst_ + annotations to cleanup the Makefile slightly. + 2004-05-10 Jean-Marc Lasgouttes * lyxrc.C: do not set user_email to a default value but use empty diff --git a/src/Makefile.am b/src/Makefile.am index d26782ad9c..6eaad4b0c3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,7 @@ MAINTAINERCLEANFILES += $(srcdir)/config.h.in 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 @: