X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=4435b51dc9cbd8152140062af335f7654d013847;hb=be94e5691ab60655ec2f61a911fe62e60d9ebd78;hp=6bfbd74cff1dc4aa6e936c9fab5b8469e3f39578;hpb=d9f0882887e9a9a5a4bdc3af8bcd7a5ef6d10472;p=lyx.git diff --git a/lib/Makefile.am b/lib/Makefile.am index 6bfbd74cff..4435b51dc9 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,24 +1,24 @@ -AUTOMAKE_OPTIONS = foreign -DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \ - lyxrc.defaults doc/LyXConfig.lyx doc/LaTeXConfig.lyx -MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -SUBDIRS = reLyX +include $(top_srcdir)/config/common.am -EXTRA_DIST = CREDITS chkconfig.ltx configure.cmd lyxrc.example \ - external_templates bind clipart doc/LaTeXConfig.lyx.in doc/LyXConfig.lyx.in examples images \ - kbd layouts lyx2lyx scripts templates tex ui encodings \ - languages symbols configure configure.m4 +DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults -CHMOD = chmod +SUBDIRS = doc lyx2lyx + +EXTRA_DIST = \ + configure.m4 \ + chkconfig.ltx -pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \ - textclass.lst packages.lst external_templates \ - encodings languages symbols +CHMOD = chmod -pkgdata_SCRIPTS = configure configure.cmd +# We cannot use dist_pkgdata_SCRIPTS for configure, since a possible +# version-suffix would get appended to the names. So we use dist_pkgdata_DATA +# and chmod manually in install-data-hook. +dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure \ + lyxrc.defaults textclass.lst packages.lst external_templates \ + encodings languages symbols syntax.default binddir = $(pkgdatadir)/bind -bind_DATA = \ +dist_bind_DATA = \ bind/broadway.bind \ bind/cua.bind \ bind/cyrkeys.bind \ @@ -28,6 +28,7 @@ bind_DATA = \ bind/greekkeys.bind \ bind/hollywood.bind \ bind/latinkeys.bind \ + bind/mac.bind \ bind/math.bind \ bind/menus.bind \ bind/pt_menus.bind \ @@ -37,14 +38,10 @@ bind_DATA = \ bind/aqua.bind clipartdir = $(pkgdatadir)/clipart -clipart_DATA = clipart/platypus.eps - -docdir = $(pkgdatadir)/doc -doc_DATA = \ - doc/LaTeXConfig.lyx +dist_clipart_DATA = clipart/platypus.eps examplesdir = $(pkgdatadir)/examples -examples_DATA = \ +dist_examples_DATA = \ examples/Foils.lyx \ examples/ItemizeBullets.lyx \ examples/Literate.lyx \ @@ -60,6 +57,10 @@ examples_DATA = \ examples/currency.lyx \ examples/cv.lyx \ examples/da_splash.lyx \ + examples/de_Lebenslauf.lyx \ + examples/de_Minipage.lyx \ + examples/de_TableExamples.lyx \ + examples/de_Waehrungen.lyx \ examples/de_beispiel_gelyxt.lyx \ examples/de_beispiel_roh.lyx \ examples/de_splash.lyx \ @@ -116,7 +117,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 \ @@ -217,7 +218,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 \ @@ -603,8 +604,8 @@ imagesmath_DATA = \ images/math/surd.xpm \ images/math/swarrow.xpm \ images/math/tau.xpm \ - images/math/textrm_0.xpm \ - images/math/textrm_A.xpm \ + images/math/textrm_Oe.xpm \ + images/math/textrm_AA.xpm \ images/math/therefore.xpm \ images/math/theta.xpm \ images/math/theta2.xpm \ @@ -672,7 +673,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 \ @@ -727,7 +728,7 @@ kbd_DATA = \ kbd/espanol.kmap layoutsdir = $(pkgdatadir)/layouts -layouts_DATA =\ +dist_layouts_DATA =\ layouts/IEEEtran.layout \ layouts/aa.layout \ layouts/aapaper.inc \ @@ -751,6 +752,8 @@ layouts_DATA =\ layouts/cv.layout \ layouts/db_lyxmacros.inc \ layouts/db_stdclass.inc \ + layouts/db_stdcharstyles.inc \ + layouts/db_stdcounters.inc \ layouts/db_stdlayouts.inc \ layouts/db_stdlists.inc \ layouts/db_stdsections.inc \ @@ -793,7 +796,6 @@ layouts_DATA =\ layouts/mwart.layout \ layouts/mwbk.layout \ layouts/mwrep.layout \ - layouts/obsolete.inc \ layouts/paper.layout \ layouts/report.layout \ layouts/revtex.layout \ @@ -803,7 +805,6 @@ layouts_DATA =\ layouts/scrclass.inc \ layouts/scrlettr.layout \ layouts/scrlttr2.layout \ - layouts/scrmacros.inc \ layouts/scrreprt.layout \ layouts/seminar.layout \ layouts/siamltex.layout \ @@ -827,7 +828,6 @@ layouts_DATA =\ layouts/numarticle.inc \ layouts/numreport.inc \ layouts/numrevtex.inc \ - layouts/db_stdcounters.inc \ layouts/agu-dtd.layout \ layouts/agu_stdclass.inc \ layouts/agu_stdcounters.inc \ @@ -837,41 +837,25 @@ layouts_DATA =\ layouts/g-brief2.layout \ layouts/svglobal.layout -lyx2lyxdir = $(pkgdatadir)/lyx2lyx -lyx2lyx_SCRIPTS = lyx2lyx/lyx2lyx -lyx2lyx_DATA = \ - lyx2lyx/error.pyc \ - lyx2lyx/lyx2lyx \ - lyx2lyx/parser_tools.pyc \ - lyx2lyx/lyx_1_4.pyc \ - lyx2lyx/parser_tools.py \ - lyx2lyx/lyxconvert_221.pyc \ - lyx2lyx/lyxconvert_223.pyc \ - lyx2lyx/lyxconvert_224.pyc \ - lyx2lyx/lyx_0_12.py \ - lyx2lyx/lyx_1_0_0.py \ - lyx2lyx/lyx_1_0_1.py \ - lyx2lyx/lyx_1_1_4.py \ - lyx2lyx/lyx_1_1_5.py \ - lyx2lyx/lyx_1_1_6.py \ - lyx2lyx/lyx_1_1_6fix3.py \ - lyx2lyx/lyx_1_2.py \ - lyx2lyx/lyx_1_3.py \ - lyx2lyx/lyx_1_4.py - scriptsdir = $(pkgdatadir)/scripts -scripts_SCRIPTS = \ +# We cannot use dist_scripts_SCRIPTS, since a possible version-suffix would +# get appended to the names. So we use dist_scripts_DATA and chmod manually +# in install-data-hook. +dist_scripts_DATA = \ scripts/TeXFiles.sh \ scripts/convertDefault.sh \ scripts/fen2ascii.py \ scripts/fig2pdftex.sh \ scripts/fig2pstex.sh \ - scripts/listerrors \ + scripts/fig_copy.sh \ scripts/legacy_lyxpreview2ppm.py \ - scripts/lyxpreview2bitmap.py + scripts/listerrors \ + scripts/lyxpreview2bitmap.py \ + scripts/lyxpreview_tools.py \ + scripts/tex_copy.py templatesdir = $(pkgdatadir)/templates -templates_DATA = \ +dist_templates_DATA = \ templates/IEEEtran.lyx \ templates/README.new_templates \ templates/aa.lyx \ @@ -894,7 +878,7 @@ templates_DATA = \ templates/agu_article.lyx texdir = $(pkgdatadir)/tex -tex_DATA = \ +dist_tex_DATA = \ tex/broadway.cls \ tex/cv.cls \ tex/hollywood.cls \ @@ -903,7 +887,7 @@ tex_DATA = \ tex/revtex.cls uidir = $(pkgdatadir)/ui -ui_DATA = \ +dist_ui_DATA = \ ui/classic.ui \ ui/default.ui \ ui/stdmenus.ui \ @@ -916,32 +900,8 @@ $(srcdir)/configure: $(srcdir)/configure.m4 lyxrc.defaults: $(srcdir)/configure $(SHELL) $< -install-xfonts: - test -f xfonts/fonts.dir || exit 0 ; \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/xfonts ; \ - files=`sed -e 's/^[0-9]*$$//' -e 's/^\([^ ]*\) .*$$/\1/' xfonts/fonts.dir` ; \ - for i in $${files} ; do \ - ln -f -s `kpsewhich $$i` $(DESTDIR)$(pkgdatadir)/xfonts/$$i ; \ - done ; \ - $(INSTALL_DATA) xfonts/fonts.dir $(DESTDIR)$(pkgdatadir)/xfonts/fonts.dir ; \ - $(INSTALL_DATA) xfonts/fonts.scale $(DESTDIR)$(pkgdatadir)/xfonts/fonts.scale ; \ - if test -f xfonts/PSres.upr ; then \ - $(INSTALL_DATA) xfonts/PSres.upr $(DESTDIR)$(pkgdatadir)/xfonts/PSres.upr ; \ - fi - -uninstall-xfonts: - rm -rf $(DESTDIR)$(pkgdatadir)/xfonts - -distclean-local: - rm -rf xfonts - -install-data-local: install-xfonts - - -uninstall-local: uninstall-xfonts - -# dist-hook: -# cd $(distdir) ; rm -rf `find . -name \*CVS\*` ; \ -# rm -rf doc/.cvsignore; \ -# [ -f doc/UserGuide.lyx ] || { cvs -Q export -r HEAD -d doc lyxdoc || \ -# echo "WARNING: Unable to get LyX Documentation from CVS!" ; true ; } +install-data-hook: + $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure + for i in $(dist_scripts_DATA); do \ + $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \ + done