From ce501e7d9832c1569efb5ae6272a5caaca3e662b Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 31 Aug 2012 18:12:06 +0000 Subject: [PATCH] Make tmp files in different make targets unique. Maybe that helps with occasional cases where one library gets built but the other apparently doesn't... git-svn-id: https://svn.dealii.org/trunk@26188 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deal.II/source/Makefile b/deal.II/source/Makefile index 649dd724e8..9809e6b168 100644 --- a/deal.II/source/Makefile +++ b/deal.II/source/Makefile @@ -173,7 +173,7 @@ $(LIBDIR)/libdeal_II$(static-lib-suffix): $(o-files) $(extra-o-files) $(LIBDIR)/libdeal_II.g$(shared-lib-suffix): $(go-files) $(extra-g.o-files) @echo "=====deal.II==========debug======$(MT)== Linking library: $(@F)" @rm -f $@ $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II.g) - @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmp.XXXXXXXXXX` && \ + @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmpg.XXXXXXXXXX` && \ $(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $$WORKFILE $(call DEAL_II_ADD_SONAME,deal_II.g) $(go-files) $(extra-g.o-files) $(deplibs.g) && \ mv $$WORKFILE $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II.g) @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II.g) $@ @@ -181,7 +181,7 @@ $(LIBDIR)/libdeal_II.g$(shared-lib-suffix): $(go-files) $(extra-g.o-files) $(LIBDIR)/libdeal_II$(shared-lib-suffix): $(o-files) $(extra-o-files) @echo "=====deal.II==========optimized==$(MT)== Linking library: $(@F)" @rm -f $@ $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II.g) - @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmp.XXXXXXXXXX` && \ + @WORKFILE=`mktemp $${TMPDIR:-/tmp}/tmpo.XXXXXXXXXX` && \ $(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $$WORKFILE $(call DEAL_II_ADD_SONAME,deal_II) $(o-files) $(extra-o-files) $(deplibs.o) && \ mv $$WORKFILE $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II) @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II) $@ -- 2.39.5