bgarrigues pushed a commit to branch automake3 in repository groff. commit 8181cee0a75e0b548549874d9aa38955931cb39f Author: Bertrand Garrigues <bertrand.garrig...@laposte.net> Date: Sat Sep 6 16:19:55 2014 +0200
Add contrib/glilypond --- Makefile.am | 1 + TESTS | 8 ++++ contrib/glilypond/Makefile.sub | 81 ---------------------------------------- contrib/glilypond/glilypond.am | 64 +++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+), 81 deletions(-) diff --git a/Makefile.am b/Makefile.am index eaf7038..ca326e0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -533,6 +533,7 @@ include $(top_srcdir)/arch/misc/misc.am include $(top_srcdir)/contrib/chem/chem.am include $(top_srcdir)/contrib/eqn2graph/eqn2graph.am include $(top_srcdir)/contrib/gdiffmk/gdiffmk.am +include $(top_srcdir)/contrib/glilypond/glilypond.am include $(top_srcdir)/font/devX100/devX100.am include $(top_srcdir)/font/devX100-12/devX100-12.am include $(top_srcdir)/font/devX75/devX75.am diff --git a/TESTS b/TESTS index 96f9577..4b76e20 100644 --- a/TESTS +++ b/TESTS @@ -317,6 +317,14 @@ TODO: 2.7 make uninstall + - Note: target 'uninstall_groffdirs' is a dependency of standard + target uninstall-hook, and removes groff's specific directories + (exampledir, libprogramdir etc ...). contrib that create + sub-directories in these groff specific directories should also + add a custom rule that is a dependency of uninstall_groffdirs to + remove the directories it created, otherwise uninstall-hook will + fail du to the impossibility to remove non-empty dir. + - Tree after uninstall: . └── usr diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub deleted file mode 100644 index f843271..0000000 --- a/contrib/glilypond/Makefile.sub +++ /dev/null @@ -1,81 +0,0 @@ -# Makefile.sub for `glilypond' - -# File position: <groff-source>/contrib/lilypond/Makefile.sub - -# Copyright (C) 2013-2014 Free Software Foundation, Inc. -# Written by Werner Lemberg <w...@gnu.org> and -# Bernd Warken <groff-bernd.warken...@web.de>. - -# This file is part of `glilypond' which is part of `groff'. - -# `groff' is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# `groff' is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -######################################################################## - -MAN1=glilypond.n - -MOSTLYCLEANADD=glilypond $(MAN1) - -all: glilypond - -# files going to lib directory `$(glilypond_dir)' - -GLILYPOND_LIB=\ - $(srcdir)/subs.pl \ - $(srcdir)/oop_fh.pl \ - $(srcdir)/args.pl - -GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed 's|$(srcdir)/||g'` - -RM=rm -f - -# create perl executable `glilypond', being stored into `bindir' - -glilypond: $(srcdir)/glilypond.pl - $(RM) $@ - sed -f "$(SH_DEPS_SED_SCRIPT)" \ - -e "s|@g@|$(g)|g" \ - -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ - -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \ - -e "s|@VERSION@|$(version)$(revision)|g" \ - $(srcdir)/glilypond.pl >$@ - chmod +x $@ - -install_data: glilypond $(GLILYPOND_LIB) - -test -d $(DESTDIR)$(bindir) \ - || $(mkinstalldirs) $(DESTDIR)$(bindir) - $(RM) $(DESTDIR)$(bindir)/glilypond - $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond - -test -d $(DESTDIR)$(glilypond_dir) \ - || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir) - for f in $(GLILYPOND_LIB_); do \ - $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f; \ - done - -uninstall_sub: - $(RM) $(DESTDIR)$(bindir)/glilypond - -for f in $(GLILYPOND_LIB_); do \ - $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \ - done - -test -d $(DESTDIR)$(glilypond_dir) && \ - rmdir $(DESTDIR)$(glilypond_dir) - -######################################################################## -# Emacs settings -######################################################################## -# -# Local Variables: -# mode: makefile -# End: diff --git a/contrib/glilypond/glilypond.am b/contrib/glilypond/glilypond.am new file mode 100644 index 0000000..2f8264a --- /dev/null +++ b/contrib/glilypond/glilypond.am @@ -0,0 +1,64 @@ +# Automake rules for `glilypond' + +# File position: <groff-source>/contrib/lilypond/glilypond.am + +# Copyright (C) 2013-2014 +# Free Software Foundation, Inc. +# Written by Werner Lemberg <w...@gnu.org> and +# Bernd Warken <groff-bernd.warken...@web.de>. +# Automake migration by Bertrand Garrigues + +# This file is part of `glilypond' which is part of `groff'. + +# `groff' is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# `groff' is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +######################################################################## +glilypond_srcdir = $(top_srcdir)/contrib/glilypond +bin_SCRIPTS += glilypond +man1_MANS += contrib/glilypond/glilypond.n + +# files going to lib directory `$(glilypond_dir)' +# TODO glilypond_dir is subsitued by configure.ac, check if this could be removed +glilyponddir = $(glilypond_dir) +dist_glilypond_DATA = \ + contrib/glilypond/subs.pl \ + contrib/glilypond/oop_fh.pl \ + contrib/glilypond/args.pl \ + contrib/glilypond/glilypond.pl + +MOSTLYCLEANFILES += glilypond +EXTRA_DIST += \ + contrib/glilypond/ChangeLog \ + contrib/glilypond/ChangeLog.0x \ + contrib/glilypond/glilypond.man \ + contrib/glilypond/README.txt \ + contrib/glilypond/examples/example.groff + + +# create perl executable `glilypond', being stored into `bindir' +glilypond: $(glilypond_srcdir)/glilypond.pl shdeps.sed + $(RM) $@ + sed -f "$(SH_DEPS_SED_SCRIPT)" \ + -e "s|[@]g[@]|$(g)|g" \ + -e "s|[@]BINDIR[@]|$(DESTDIR)$(bindir)|g" \ + -e "s|[@]glilypond_dir[@]|$(DESTDIR)$(glilypond_dir)|g" \ + -e "s|[@]VERSION[@]|$(VERSION)|g" \ + $(glilypond_srcdir)/glilypond.pl >$@ + chmod +x $@ + +uninstall_groffdirs: uninstall-glilypond-hook +uninstall-glilypond-hook: + if test -d $(DESTDIR)$(glilyponddir); then \ + rmdir $(DESTDIR)$(glilyponddir); \ + fi _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit