From d15a06dba2bd5046bf55003ae9fa732a48964457 Mon Sep 17 00:00:00 2001 From: wolf Date: Fri, 20 Aug 2004 19:58:53 +0000 Subject: [PATCH] Change path to object files. git-svn-id: https://svn.dealii.org/trunk@9560 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/umfpack/AMD/Source/Makefile | 4 +- deal.II/contrib/umfpack/Makefile | 4 +- .../contrib/umfpack/UMFPACK/Source/Makefile | 56 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/deal.II/contrib/umfpack/AMD/Source/Makefile b/deal.II/contrib/umfpack/AMD/Source/Makefile index a285ac591b..499304ea67 100644 --- a/deal.II/contrib/umfpack/AMD/Source/Makefile +++ b/deal.II/contrib/umfpack/AMD/Source/Makefile @@ -17,8 +17,8 @@ INC = ../Include/amd.h amd_internal.h # object files for each version #------------------------------------------------------------------------------- -AMDI = $(addprefix $D/lib/umfpack/, $(addsuffix .$(OBJEXT), $(subst amd_,amd_i_,$(AMD)))) -AMDL = $(addprefix $D/lib/umfpack/, $(addsuffix .$(OBJEXT), $(subst amd_,amd_l_,$(AMD)))) +AMDI = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst amd_,amd_i_,$(AMD)))) +AMDL = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst amd_,amd_l_,$(AMD)))) #------------------------------------------------------------------------------- # compile each int and long routine (with no real/complex version) diff --git a/deal.II/contrib/umfpack/Makefile b/deal.II/contrib/umfpack/Makefile index 1da96a2a71..8ffcc49f41 100644 --- a/deal.II/contrib/umfpack/Makefile +++ b/deal.II/contrib/umfpack/Makefile @@ -17,12 +17,12 @@ UMFPACK: $(LIBDIR)/liblac_umfpack.so: AMD UMFPACK @echo "=====umfpack==========optimized==$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $D/lib/umfpack/*.o + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $D/lib/contrib/umfpack/*.o $(LIBDIR)/liblac_umfpack.a: AMD UMFPACK @echo "=====umfpack==========optimized==$(MT)== Linking library: $(@F)" - @$(AR) ru $@ $D/lib/umfpack/*.o + @$(AR) ru $@ $D/lib/contrib/umfpack/*.o @$(RANLIB) $@ diff --git a/deal.II/contrib/umfpack/UMFPACK/Source/Makefile b/deal.II/contrib/umfpack/UMFPACK/Source/Makefile index a2801eaf20..ba1433cdff 100644 --- a/deal.II/contrib/umfpack/UMFPACK/Source/Makefile +++ b/deal.II/contrib/umfpack/UMFPACK/Source/Makefile @@ -72,21 +72,21 @@ INC = ../Include/umfpack.h \ # object files for each version #------------------------------------------------------------------------------- -DI = $(addprefix $D/lib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_di_,$(UMF)) $(subst umfpack_,umfpack_di_,$(USER)))) -DL = $(addprefix $D/lib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_dl_,$(UMF)) $(subst umfpack_,umfpack_dl_,$(USER)))) -I = $(addprefix $D/lib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_i_,$(UMFINT)))) -L = $(addprefix $D/lib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_l_,$(UMFINT)))) -GN = $(addprefix $D/lib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umfpack_,umfpack_gn_,$(GENERIC)))) +DI = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_di_,$(UMF)) $(subst umfpack_,umfpack_di_,$(USER)))) +DL = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_dl_,$(UMF)) $(subst umfpack_,umfpack_dl_,$(USER)))) +I = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_i_,$(UMFINT)))) +L = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umf_,umf_l_,$(UMFINT)))) +GN = $(addprefix $D/lib/contrib/umfpack/, $(addsuffix .$(OBJEXT), $(subst umfpack_,umfpack_gn_,$(GENERIC)))) #------------------------------------------------------------------------------- # compile each int and long routine (with no real/complex version) #------------------------------------------------------------------------------- -$D/lib/umfpack/umf_i_%.$(OBJEXT): umf_%.c $(INC) +$D/lib/contrib/umfpack/umf_i_%.$(OBJEXT): umf_%.c $(INC) @echo =====umfpack==========optimized==$(MT)== $(