]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make tmp files in different make targets unique. Maybe that helps with
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 31 Aug 2012 18:12:06 +0000 (18:12 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 31 Aug 2012 18:12:06 +0000 (18:12 +0000)
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

index 649dd724e87bbe23e623fd4f72ece829fdf53551..9809e6b16832209c249a42dfc07cd3a7a7e1c771 100644 (file)
@@ -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) $@

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.