From ee9627a610d934cb5c6e3b31e020c86b6bcd27ff Mon Sep 17 00:00:00 2001 From: janneke Date: Tue, 23 Sep 2003 20:20:17 +0000 Subject: [PATCH] * GNUmakefile.in (SUBDIRS): Add elisp. * elisp/lilypond-mode.el: * elisp/lilypond-init.el: * elisp/lilypond-indent.el: * elisp/lilypond-font-lock.el: Move from top dir. * stepmake/stepmake/elisp-vars.make: New file. * config.make.in (elispdir): Add. * GNUmakefile.in: * make/lilypond.redhat.spec.in: * debian/rules: Fix lilypond.words stuff a bit. For running from , adding --- ChangeLog | 11 ++++++++ GNUmakefile.in | 18 ++++++------- config.make.in | 1 + debian/rules | 3 --- elisp/GNUmakefile | 25 +++++++++++++++++++ .../lilypond-font-lock.el | 0 .../lilypond-indent.el | 0 lilypond-init.el => elisp/lilypond-init.el | 0 lilypond-mode.el => elisp/lilypond-mode.el | 2 +- make/lilypond.mandrake.spec.in | 3 +-- make/lilypond.redhat.spec.in | 4 +-- stepmake/stepmake/elisp-rules.make | 1 + stepmake/stepmake/elisp-targets.make | 1 + stepmake/stepmake/elisp-vars.make | 3 +++ 14 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 elisp/GNUmakefile rename lilypond-font-lock.el => elisp/lilypond-font-lock.el (100%) rename lilypond-indent.el => elisp/lilypond-indent.el (100%) rename lilypond-init.el => elisp/lilypond-init.el (100%) rename lilypond-mode.el => elisp/lilypond-mode.el (99%) create mode 100644 stepmake/stepmake/elisp-rules.make create mode 100644 stepmake/stepmake/elisp-targets.make create mode 100644 stepmake/stepmake/elisp-vars.make diff --git a/ChangeLog b/ChangeLog index 6ede7a4661..5b1c842d92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2003-09-23 Jan Nieuwenhuizen + * GNUmakefile.in (SUBDIRS): Add elisp. + + * elisp/lilypond-mode.el: + * elisp/lilypond-init.el: + * elisp/lilypond-indent.el: + * elisp/lilypond-font-lock.el: Move from top dir. + + * stepmake/stepmake/elisp-vars.make: New file. + + * config.make.in (elispdir): Add. + * Documentation/topdocs/INSTALL.texi: Typo. * make/ly-rules.make: Test for files instead of touching void and diff --git a/GNUmakefile.in b/GNUmakefile.in index 8a13e2051c..343fe31019 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -9,6 +9,7 @@ depth = . # descent order into subdirectories # SUBDIRS = buildscripts python scripts \ + elisp \ flower lily \ mf ly tex ps scm \ po make \ @@ -16,11 +17,14 @@ SUBDIRS = buildscripts python scripts \ Documentation input # -SCRIPTS = configure aclocal.m4 autogen.sh +SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt IN_FILES := $(wildcard *.in) -EXTRA_DIST_FILES = $(wildcard *.el) VERSION lilypond.vim vimrc $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh +PATCH_FILES = emacsclient.patch server.el.patch darwin.patch +VIM_FILES = vimrc lilypond.vim +EXTRA_DIST_FILES = VERSION .cvsignore $(README_FILES) $(SCRIPTS) $(IN_FILES) \ + $(PATCH_FILES) $(VIM_FILES) NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION @@ -33,12 +37,6 @@ include $(depth)/make/stepmake.make doc: $(MAKE) -C Documentation -LILYPOND_WORDS = $(outdir)/lilypond.words.el $(outdir)/lilypond.words.vim -$(LILYPOND_WORDS): $(srcdir)/lily/my-lily-lexer.cc $(buildscript-dir)/lilypond.words.py $(srcdir)/scm/new-markup.scm $(srcdir)/ly/engraver-init.ly - cd $(builddir) && $(PYTHON) $(buildscript-dir)/lilypond.words.py $(outdir) - -all: $(LILYPOND_WORDS) - web-install: -$(INSTALL) -m 755 -d $(webdir) tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz @@ -120,8 +118,8 @@ $(builddir)/share/lilypond-force: ln -s ../../../mf/$(outconfbase) tfm && \ ln -s ../../../mf/$(outconfbase) type1 cd $(builddir)/share/lilypond/elisp && \ - ln -sf ../../../$(outconfbase)/lilypond.words.el . && \ - ln -s $(abs-srcdir)/*.el . + ln -sf ../../../elisp/$(outconfbase)/lilypond.words.el . && \ + ln -s $(abs-srcdir)/elisp/*.el . $(foreach i,$(CATALOGS), \ mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \ cd $(builddir)/share/locale/$i/LC_MESSAGES && \ diff --git a/config.make.in b/config.make.in index 048aebd4e3..b2012ee488 100644 --- a/config.make.in +++ b/config.make.in @@ -37,6 +37,7 @@ srcdir = @srcdir@ stepmake = @stepmake@ docdir = $(datadir)/doc/ omfdir = $(datadir)/omf/ +elispdir = $(datadir)/site-lisp # move out of config.make.in? package_datadir = $(datadir)/$(package) diff --git a/debian/rules b/debian/rules index 768d33c3d5..fb06f3b809 100644 --- a/debian/rules +++ b/debian/rules @@ -122,9 +122,6 @@ binary-arch: DH_OPTIONS=-s binary-arch: build install dh_testdir dh_testroot - cp -av lilypond-mode.el lilypond-font-lock.el lilypond-indent.el \ - out/lilypond.words.el \ - $(r)/usr/share/emacs/site-lisp/ dh_installdocs AUTHORS.txt NEWS.txt README.txt \ DEDICATION THANKS diff --git a/elisp/GNUmakefile b/elisp/GNUmakefile new file mode 100644 index 0000000000..8a0344f73b --- /dev/null +++ b/elisp/GNUmakefile @@ -0,0 +1,25 @@ +depth = .. + +elispdir = $(datadir)/emacs/site-lisp + +INSTALLATION_DIR=$(elispdir) +INSTALLATION_FILES=$(EL_FILES) + +INSTALLATION_OUT_DIR=$(elispdir) +INSTALLATION_OUT_FILES=$(outdir)/lilypond.words.el + +STEPMAKE_TEMPLATES=elisp install install-out + +include $(depth)/make/stepmake.make + +LILYPOND_WORDS = $(outdir)/lilypond.words.el $(outdir)/lilypond.words.vim +LILYPOND_WORDS_DEPENDS =\ + $(topdir)/lily/my-lily-lexer.cc \ + $(buildscript-dir)/lilypond.words.py \ + $(topdir)/scm/new-markup.scm \ + $(topdir)/ly/engraver-init.ly + +$(LILYPOND_WORDS): + cd $(topdir) && $(PYTHON) buildscripts/lilypond.words.py $(builddir)/elisp/$(outconfbase) + +all: $(LILYPOND_WORDS) diff --git a/lilypond-font-lock.el b/elisp/lilypond-font-lock.el similarity index 100% rename from lilypond-font-lock.el rename to elisp/lilypond-font-lock.el diff --git a/lilypond-indent.el b/elisp/lilypond-indent.el similarity index 100% rename from lilypond-indent.el rename to elisp/lilypond-indent.el diff --git a/lilypond-init.el b/elisp/lilypond-init.el similarity index 100% rename from lilypond-init.el rename to elisp/lilypond-init.el diff --git a/lilypond-mode.el b/elisp/lilypond-mode.el similarity index 99% rename from lilypond-mode.el rename to elisp/lilypond-mode.el index 10b3147ff8..51052b9cee 100644 --- a/lilypond-mode.el +++ b/elisp/lilypond-mode.el @@ -396,7 +396,7 @@ in LilyPond-include-path." ;; Should expand this to include possible keyboard shortcuts which ;; could then be mapped to define-key and menu. `( - ("Raw LilyPond" . ("lilypond-bin %s" . "LaTeX")) + ("LilyPond" . ("lilypond-bin %s" . "LaTeX")) ("TeX" . ("tex '\\nonstopmode\\input %t'" . "View")) ("2Dvi" . ("lilypond %s" . "View")) diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index 2ee1f4bf63..5404a1e035 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -101,8 +101,7 @@ local_lilypond_libdir=$RPM_BUILD_ROOT/%{_libdir}/%{name}/%{version} %endif mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ -install -m 644 lilypond-init.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d +install -m 644 elisp/lilypond-init.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d bzip2 $RPM_BUILD_ROOT%{_mandir}/man1/* diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 5204df4007..0d0abd6f44 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -71,9 +71,7 @@ gzip -9fn $RPM_BUILD_ROOT%{_infodir}/* %endif mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -install -m 644 lilypond-mode.el lilypond-font-lock.el lilypond-indent.el out/lilypond.words.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/ - -install -m 644 lilypond-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d +install -m 644 elisp/lilypond-init.el $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/site-start.d gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/* diff --git a/stepmake/stepmake/elisp-rules.make b/stepmake/stepmake/elisp-rules.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/elisp-rules.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/elisp-targets.make b/stepmake/stepmake/elisp-targets.make new file mode 100644 index 0000000000..1bb8bf6d7f --- /dev/null +++ b/stepmake/stepmake/elisp-targets.make @@ -0,0 +1 @@ +# empty diff --git a/stepmake/stepmake/elisp-vars.make b/stepmake/stepmake/elisp-vars.make new file mode 100644 index 0000000000..14bc8e4d85 --- /dev/null +++ b/stepmake/stepmake/elisp-vars.make @@ -0,0 +1,3 @@ + +EL_FILES := $(wildcard *.el) +SOURCE_FILES += $(EL_FILES) -- 2.39.2