diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-30 09:41:34 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-01-30 09:41:34 +0000 |
commit | 0428e986f06209f75419776b630d34e93080d57a (patch) | |
tree | c9c9d2568452d95542b1d6461187e7548be116b7 /Build/source/texk/detex | |
parent | 27c9c2d0e7b7b11e85e6fbffb7ee0e0742d4daef (diff) |
build system: Allow subdir-objects as required for Automake 1.14
git-svn-id: svn://tug.org/texlive/trunk@28989 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/detex')
-rw-r--r-- | Build/source/texk/detex/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/detex/Makefile.am | 8 | ||||
-rw-r--r-- | Build/source/texk/detex/Makefile.in | 54 | ||||
-rw-r--r-- | Build/source/texk/detex/detex-2.8/detex.c (renamed from Build/source/texk/detex/detex.c) | 0 |
4 files changed, 40 insertions, 26 deletions
diff --git a/Build/source/texk/detex/ChangeLog b/Build/source/texk/detex/ChangeLog index b344a8731c5..570c4237139 100644 --- a/Build/source/texk/detex/ChangeLog +++ b/Build/source/texk/detex/ChangeLog @@ -1,3 +1,7 @@ +2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Allow subdir-objects. + 2012-11-19 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Avoid use of deprecated INCLUDES. diff --git a/Build/source/texk/detex/Makefile.am b/Build/source/texk/detex/Makefile.am index c4030b42ccc..45f02f63ef9 100644 --- a/Build/source/texk/detex/Makefile.am +++ b/Build/source/texk/detex/Makefile.am @@ -1,6 +1,6 @@ ## Makefile.am for the TeX Live subdirectory texk/detex/ ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## ACLOCAL_AMFLAGS = -I ../../m4 @@ -12,7 +12,7 @@ EXTRA_DIST += $(DETEX_TREE)-PATCHES # in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn` + rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` AM_CPPFLAGS = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES) -DNO_MALLOC_DECL -DKPATHSEA -Dlint AM_CFLAGS = $(WARNING_CFLAGS) @@ -25,8 +25,8 @@ AM_CFLAGS = $(WARNING_CFLAGS) bin_PROGRAMS = detex detex_SOURCES = \ - $(DETEX_TREE)/detex.h \ - $(DETEX_TREE)/detex.l + @DETEX_TREE@/detex.h \ + @DETEX_TREE@/detex.l LDADD = $(KPATHSEA_LIBS) diff --git a/Build/source/texk/detex/Makefile.in b/Build/source/texk/detex/Makefile.in index 96b7e798967..f148c2c5c23 100644 --- a/Build/source/texk/detex/Makefile.in +++ b/Build/source/texk/detex/Makefile.in @@ -54,7 +54,7 @@ bin_PROGRAMS = detex$(EXEEXT) subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/c-auto.in detex.c $(dist_check_SCRIPTS) \ + $(srcdir)/c-auto.in @DETEX_TREE@/detex.c $(dist_check_SCRIPTS) \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/ylwrap \ $(top_srcdir)/../../build-aux/test-driver ChangeLog \ @@ -87,7 +87,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -am_detex_OBJECTS = detex.$(OBJEXT) +am__dirstamp = $(am__leading_dot)dirstamp +am_detex_OBJECTS = @DETEX_TREE@/detex.$(OBJEXT) detex_OBJECTS = $(am_detex_OBJECTS) detex_LDADD = $(LDADD) am__DEPENDENCIES_1 = @@ -519,8 +520,8 @@ EXTRA_DIST = $(DETEX_TREE) $(DETEX_TREE)-PATCHES test.lout test.tex \ AM_CPPFLAGS = -I$(top_srcdir)/$(DETEX_TREE) $(KPATHSEA_INCLUDES) -DNO_MALLOC_DECL -DKPATHSEA -Dlint AM_CFLAGS = $(WARNING_CFLAGS) detex_SOURCES = \ - $(DETEX_TREE)/detex.h \ - $(DETEX_TREE)/detex.l + @DETEX_TREE@/detex.h \ + @DETEX_TREE@/detex.l LDADD = $(KPATHSEA_LIBS) man1_MANS = \ @@ -632,35 +633,47 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list +@DETEX_TREE@/$(am__dirstamp): + @$(MKDIR_P) @DETEX_TREE@ + @: > @DETEX_TREE@/$(am__dirstamp) +@DETEX_TREE@/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) @DETEX_TREE@/$(DEPDIR) + @: > @DETEX_TREE@/$(DEPDIR)/$(am__dirstamp) +@DETEX_TREE@/detex.$(OBJEXT): @DETEX_TREE@/$(am__dirstamp) \ + @DETEX_TREE@/$(DEPDIR)/$(am__dirstamp) detex$(EXEEXT): $(detex_OBJECTS) $(detex_DEPENDENCIES) $(EXTRA_detex_DEPENDENCIES) @rm -f detex$(EXEEXT) $(AM_V_CCLD)$(LINK) $(detex_OBJECTS) $(detex_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f @DETEX_TREE@/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/detex.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@@DETEX_TREE@/$(DEPDIR)/detex.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ +@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< @@ -668,11 +681,6 @@ distclean-compile: .l.c: $(AM_V_LEX)$(am__skiplex) $(SHELL) $(YLWRAP) $< $(LEX_OUTPUT_ROOT).c $@ -- $(LEXCOMPILE) -detex.c: $(DETEX_TREE)/detex.l - $(AM_V_LEX) \ - $(am__skiplex) \ - $(SHELL) $(YLWRAP) `test -f '$(DETEX_TREE)/detex.l' || echo '$(srcdir)/'`$(DETEX_TREE)/detex.l $(LEX_OUTPUT_ROOT).c detex.c -- $(LEX) $(AM_LFLAGS) $(LFLAGS) - mostlyclean-libtool: -rm -f *.lo @@ -1136,18 +1144,20 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f @DETEX_TREE@/$(DEPDIR)/$(am__dirstamp) + -rm -f @DETEX_TREE@/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -rm -f detex.c + -rm -f @DETEX_TREE@/detex.c clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf ./$(DEPDIR) + -rm -rf @DETEX_TREE@/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -1195,7 +1205,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf ./$(DEPDIR) + -rm -rf @DETEX_TREE@/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1240,7 +1250,7 @@ uninstall-man: uninstall-man1 # in case of an SVN repository dist-hook: - rm -rf `find $(distdir) -name .svn` + rm -rf `find $(distdir) -name .svn -o -name .deps -o -name .dirstamp -o -name '*.$(OBJEXT)'` $(detex_OBJECTS): $(KPATHSEA_DEPEND) diff --git a/Build/source/texk/detex/detex.c b/Build/source/texk/detex/detex-2.8/detex.c index c6114c5b71d..c6114c5b71d 100644 --- a/Build/source/texk/detex/detex.c +++ b/Build/source/texk/detex/detex-2.8/detex.c |