diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/gregorio/ChangeLog | 3 | ||||
| -rw-r--r-- | Build/source/texk/gregorio/Makefile.am | 2 | ||||
| -rw-r--r-- | Build/source/texk/gregorio/Makefile.in | 11 | ||||
| -rw-r--r-- | Build/source/texk/gregorio/config_.h.in | 3 | ||||
| -rwxr-xr-x | Build/source/texk/gregorio/configure | 8 |
5 files changed, 8 insertions, 19 deletions
diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog index 9fb8198bd28..7220feaea9d 100644 --- a/Build/source/texk/gregorio/ChangeLog +++ b/Build/source/texk/gregorio/ChangeLog @@ -1,8 +1,9 @@ 2016-09-29 Karl Berry <karl@tug.org> - * Makefile.am (bin_PROGRAMS): just "gregorio" (same as TL'16). * configure.ac (FILENAME_VERSION): no need to define for TL. * gregorio.test (gregorio): do not use $FILENAME_VERSION. + * Makefile.am (bin_PROGRAMS): just "gregorio" (same as TL'16). + (gregorio.log): likewise. 2016-09-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp> diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am index 44e72320ede..7bd20adc715 100644 --- a/Build/source/texk/gregorio/Makefile.am +++ b/Build/source/texk/gregorio/Makefile.am @@ -57,6 +57,6 @@ $(gregorio_OBJECTS): $(KPATHSEA_DEPEND) ## TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)' TESTS = gregorio.test -gregorio.log: gregorio-$(FILENAME_VERSION)$(EXEEXT) +gregorio.log: gregorio$(EXEEXT) EXTRA_DIST += $(TESTS) DISTCLEANFILES = factus.gtex veni.gtex diff --git a/Build/source/texk/gregorio/Makefile.in b/Build/source/texk/gregorio/Makefile.in index 5c112c7d431..566b55e9def 100644 --- a/Build/source/texk/gregorio/Makefile.in +++ b/Build/source/texk/gregorio/Makefile.in @@ -88,7 +88,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = gregorio-$(FILENAME_VERSION)$(EXEEXT) +bin_PROGRAMS = gregorio$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ @@ -463,7 +463,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FILENAME_VERSION = @FILENAME_VERSION@ GREGORIO_TREE = @GREGORIO_TREE@ GREP = @GREP@ INSTALL = @INSTALL@ @@ -797,8 +796,8 @@ clean-binPROGRAMS: @GREGORIO_TREE@/src/vowel/$(am__dirstamp) \ @GREGORIO_TREE@/src/vowel/$(DEPDIR)/$(am__dirstamp) -gregorio-$(FILENAME_VERSION)$(EXEEXT): $(gregorio_OBJECTS) $(gregorio_DEPENDENCIES) $(EXTRA_gregorio_DEPENDENCIES) - @rm -f gregorio$(EXEEXT) gregorio-$(FILENAME_VERSION)$(EXEEXT) +gregorio$(EXEEXT): $(gregorio_OBJECTS) $(gregorio_DEPENDENCIES) $(EXTRA_gregorio_DEPENDENCIES) + @rm -f gregorio$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gregorio_OBJECTS) $(gregorio_LDADD) $(LIBS) mostlyclean-compile: @@ -823,9 +822,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-elements-determination.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-glyphs-determination.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-notes-determination-l.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-score-determination.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-score-determination-l.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-score-determination-y.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-score-determination.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gabc/$(DEPDIR)/gabc-write.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gregoriotex/$(DEPDIR)/gregoriotex-position.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@@GREGORIO_TREE@/src/gregoriotex/$(DEPDIR)/gregoriotex-write.Po@am__quote@ @@ -1401,7 +1400,7 @@ dist-hook: $(gregorio_OBJECTS): $(KPATHSEA_DEPEND) @KPATHSEA_RULE@ -gregorio.log: gregorio-$(FILENAME_VERSION)$(EXEEXT) +gregorio.log: gregorio$(EXEEXT) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Build/source/texk/gregorio/config_.h.in b/Build/source/texk/gregorio/config_.h.in index 3f8ed63e3b1..875e70578b0 100644 --- a/Build/source/texk/gregorio/config_.h.in +++ b/Build/source/texk/gregorio/config_.h.in @@ -9,9 +9,6 @@ /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID -/* version suitable for file names */ -#undef FILENAME_VERSION - /* Define to 1 if realpath() can malloc memory, always gives an absolute path, and handles trailing slash correctly. */ #undef FUNC_REALPATH_WORKS diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure index f9b47ac1965..a14f4c3a10c 100755 --- a/Build/source/texk/gregorio/configure +++ b/Build/source/texk/gregorio/configure @@ -724,7 +724,6 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -FILENAME_VERSION target_alias host_alias build_alias @@ -2710,13 +2709,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -FILENAME_VERSION="4_2_0" - - -cat >>confdefs.h <<_ACEOF -#define FILENAME_VERSION "$FILENAME_VERSION" -_ACEOF - ac_aux_dir= |