Change path to object files.

git-svn-id: https://svn.dealii.org/trunk@9560 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/contrib/umfpack/AMD/Source/Makefile b/deal.II/contrib/umfpack/AMD/Source/Makefile
index a285ac591b5552088bf7449351c1e217f5c15961..499304ea67b42450d836eff76e50ef7e7e666ec7 100644 (file)
--- 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 1da96a2a7126dd8f502682868c45366d75d79e5c..8ffcc49f4132700b4c3bd62c4092f7c5ff5f050b 100644 (file)
--- 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 a2801eaf20212cab809f2040851e2fca9fd9374d..ba1433cdff31886339904419166b22544349be1c 100644 (file)
--- 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)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
 
-$D/lib/umfpack/umf_l_%.$(OBJEXT): umf_%.c $(INC)
+$D/lib/contrib/umfpack/umf_l_%.$(OBJEXT): umf_%.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
 
@@ -94,43 +94,43 @@ $D/lib/umfpack/umf_l_%.$(OBJEXT): umf_%.c $(INC)
 # compile each routine in the DI version
 #-------------------------------------------------------------------------------
 
-$D/lib/umfpack/umf_di_%.$(OBJEXT): umf_%.c $(INC)
+$D/lib/contrib/umfpack/umf_di_%.$(OBJEXT): umf_%.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
 
-$D/lib/umfpack/umf_di_%hsolve.$(OBJEXT): umf_%tsolve.c $(INC)
+$D/lib/contrib/umfpack/umf_di_%hsolve.$(OBJEXT): umf_%tsolve.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DCONJUGATE_SOLVE -c $< -o $@
 
-$D/lib/umfpack/umf_di_triplet_map_x.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_di_triplet_map_x.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDO_MAP -DDO_VALUES -c $< -o $@
 
-$D/lib/umfpack/umf_di_triplet_map_nox.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_di_triplet_map_nox.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDO_MAP -c $< -o $@
 
-$D/lib/umfpack/umf_di_triplet_nomap_x.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_di_triplet_nomap_x.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDO_VALUES -c $< -o $@
 
-$D/lib/umfpack/umf_di_triplet_nomap_nox.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_di_triplet_nomap_nox.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
 
-$D/lib/umfpack/umf_di_assemble_fixq.$(OBJEXT): umf_assemble.c $(INC)
+$D/lib/contrib/umfpack/umf_di_assemble_fixq.$(OBJEXT): umf_assemble.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DFIXQ -c $< -o $@
 
-$D/lib/umfpack/umf_di_store_lu_drop.$(OBJEXT): umf_store_lu.c $(INC)
+$D/lib/contrib/umfpack/umf_di_store_lu_drop.$(OBJEXT): umf_store_lu.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DDROP -c $< -o $@
 
-$D/lib/umfpack/umfpack_di_wsolve.$(OBJEXT): umfpack_solve.c $(INC)
+$D/lib/contrib/umfpack/umfpack_di_wsolve.$(OBJEXT): umfpack_solve.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -DWSOLVE -c $< -o $@
 
-$D/lib/umfpack/umfpack_di_%.$(OBJEXT): umfpack_%.c $(INC)
+$D/lib/contrib/umfpack/umfpack_di_%.$(OBJEXT): umfpack_%.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDINT -c $< -o $@
 
@@ -138,43 +138,43 @@ $D/lib/umfpack/umfpack_di_%.$(OBJEXT): umfpack_%.c $(INC)
 # compile each routine in the DL version
 #-------------------------------------------------------------------------------
 
-$D/lib/umfpack/umf_dl_%.$(OBJEXT): umf_%.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_%.$(OBJEXT): umf_%.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
 
-$D/lib/umfpack/umf_dl_%hsolve.$(OBJEXT): umf_%tsolve.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_%hsolve.$(OBJEXT): umf_%tsolve.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DCONJUGATE_SOLVE -c $< -o $@
 
-$D/lib/umfpack/umf_dl_triplet_map_x.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_triplet_map_x.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDO_MAP -DDO_VALUES -c $< -o $@
 
-$D/lib/umfpack/umf_dl_triplet_map_nox.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_triplet_map_nox.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDO_MAP -c $< -o $@
 
-$D/lib/umfpack/umf_dl_triplet_nomap_x.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_triplet_nomap_x.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDO_VALUES -c $< -o $@
 
-$D/lib/umfpack/umf_dl_triplet_nomap_nox.$(OBJEXT): umf_triplet.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_triplet_nomap_nox.$(OBJEXT): umf_triplet.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
 
-$D/lib/umfpack/umf_dl_assemble_fixq.$(OBJEXT): umf_assemble.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_assemble_fixq.$(OBJEXT): umf_assemble.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DFIXQ -c $< -o $@
 
-$D/lib/umfpack/umf_dl_store_lu_drop.$(OBJEXT): umf_store_lu.c $(INC)
+$D/lib/contrib/umfpack/umf_dl_store_lu_drop.$(OBJEXT): umf_store_lu.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DDROP -c $< -o $@
 
-$D/lib/umfpack/umfpack_dl_wsolve.$(OBJEXT): umfpack_solve.c $(INC)
+$D/lib/contrib/umfpack/umfpack_dl_wsolve.$(OBJEXT): umfpack_solve.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -DWSOLVE -c $< -o $@
 
-$D/lib/umfpack/umfpack_dl_%.$(OBJEXT): umfpack_%.c $(INC)
+$D/lib/contrib/umfpack/umfpack_dl_%.$(OBJEXT): umfpack_%.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -DDLONG -c $< -o $@
 
@@ -182,7 +182,7 @@ $D/lib/umfpack/umfpack_dl_%.$(OBJEXT): umfpack_%.c $(INC)
 # Create the generic routines (GN) using a generic rule
 #-------------------------------------------------------------------------------
 
-$D/lib/umfpack/umfpack_gn_%.$(OBJEXT): umfpack_%.c $(INC)
+$D/lib/contrib/umfpack/umfpack_gn_%.$(OBJEXT): umfpack_%.c $(INC)
        @echo =====umfpack==========optimized==$(MT)== $(<F)
        $(CC) $(CFLAGS) -I../Include -I../../AMD/Include -I../../AMD/Source -c $< -o $@