summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-18 06:36:17 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-18 06:36:17 +0000
commitab39d7567414e3f438909bb56e921e02e3f5c788 (patch)
tree3e0f6712b724585b96afca2732d600e0cdaa7837 /Build
parentee1cf32c62fa2f77e5e3533396722a3a33d6d8c8 (diff)
web2c/web2c: Avoid more 'parallel make' problems -- this time do it really right
git-svn-id: svn://tug.org/texlive/trunk@31227 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.am2
-rw-r--r--Build/source/texk/web2c/web2c/Makefile.in44
2 files changed, 20 insertions, 26 deletions
diff --git a/Build/source/texk/web2c/web2c/Makefile.am b/Build/source/texk/web2c/web2c/Makefile.am
index 85d590e230e..93669d91c30 100644
--- a/Build/source/texk/web2c/web2c/Makefile.am
+++ b/Build/source/texk/web2c/web2c/Makefile.am
@@ -11,7 +11,7 @@ AM_CFLAGS = $(WARNING_CFLAGS)
noinst_PROGRAMS = web2c fixwrites splitup makecpool
-noinst_LIBRARIES = libweb2c.a
+EXTRA_LIBRARIES = libweb2c.a
BUILT_SOURCES = w2c/config.h
diff --git a/Build/source/texk/web2c/web2c/Makefile.in b/Build/source/texk/web2c/web2c/Makefile.in
index 30498e73e4a..d692998beb2 100644
--- a/Build/source/texk/web2c/web2c/Makefile.in
+++ b/Build/source/texk/web2c/web2c/Makefile.in
@@ -17,7 +17,6 @@
-
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -120,7 +119,6 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/kpathsea/c-auto.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_@AM_V@)
am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
@@ -379,7 +377,7 @@ ACLOCAL_AMFLAGS = -I ../../../m4
AM_CPPFLAGS = -I$(srcdir)/../..
AM_YFLAGS = -d -v
AM_CFLAGS = $(WARNING_CFLAGS)
-noinst_LIBRARIES = libweb2c.a
+EXTRA_LIBRARIES = libweb2c.a
BUILT_SOURCES = w2c/config.h
DISTCLEANFILES = w2c/config.h web2c-parser.output
noinst_HEADERS = coerce.h
@@ -470,9 +468,6 @@ $(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f kpathsea/c-auto.h kpathsea/stamp-h1
-clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
libweb2c.a: $(libweb2c_a_OBJECTS) $(libweb2c_a_DEPENDENCIES) $(EXTRA_libweb2c_a_DEPENDENCIES)
$(AM_V_at)-rm -f libweb2c.a
$(AM_V_AR)$(libweb2c_a_AR) libweb2c.a $(libweb2c_a_OBJECTS) $(libweb2c_a_LIBADD)
@@ -783,8 +778,7 @@ distcleancheck: distclean
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
- $(HEADERS)
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS)
installdirs:
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
@@ -825,8 +819,8 @@ maintainer-clean-generic:
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
clean: clean-am
-clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
- clean-noinstPROGRAMS mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+ mostlyclean-am
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -900,21 +894,21 @@ uninstall-am:
.MAKE: all check install install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \
- clean-cscope clean-generic clean-libtool clean-noinstLIBRARIES \
- clean-noinstPROGRAMS cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-compile \
- distclean-generic distclean-hdr distclean-libtool \
- distclean-local distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
+ clean-cscope clean-generic clean-libtool clean-noinstPROGRAMS \
+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+ distcheck distclean distclean-compile distclean-generic \
+ distclean-hdr distclean-libtool distclean-local distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am
# Don't include our <c-auto.h>.