From: bangerth Date: Wed, 29 Oct 2008 02:26:12 +0000 (+0000) Subject: Patch by Christian Cornelssen: Make links relative to allow moving install directories. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bba6f561017d59f8c4c9d62041566ba5d4fa120b;p=dealii-svn.git Patch by Christian Cornelssen: Make links relative to allow moving install directories. git-svn-id: https://svn.dealii.org/trunk@17391 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index 292bb89412..f1e523fdb4 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -79,12 +79,12 @@ $(LIBDIR)/libbase.g$(static-lib-suffix): $(go-files) $(LIBDIR)/libbase$(shared-lib-suffix): $(o-files) @echo "=====base=============optimized==$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,base) $(call DEAL_II_ADD_SONAME,base) $(o-files) $(extra-o-files) $(deplibs.o) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,base) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,base) $@ $(LIBDIR)/libbase.g$(shared-lib-suffix): $(go-files) @echo "=====base=============debug======$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,base.g) $(call DEAL_II_ADD_SONAME,base.g) $(go-files) $(extra-o-files) $(deplibs.g) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,base.g) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,base.g) $@ diff --git a/deal.II/contrib/hsl/Makefile b/deal.II/contrib/hsl/Makefile index a7026cf224..2e4134b86c 100644 --- a/deal.II/contrib/hsl/Makefile +++ b/deal.II/contrib/hsl/Makefile @@ -46,7 +46,7 @@ $(LIBDIR)/libhsl$(static-lib-suffix): $(forward-declarations) $(o-files) $(LIBDIR)/libhsl$(shared-lib-suffix): $(forward-declarations) $(o-files) @echo =====hsl==============optimized==$(MT)== Linking library: $(@F) @$(SHLIBLD) $(LDFLAGS) -shared -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,hsl) $(call DEAL_II_ADD_SONAME,hsl) $(o-files) $(F77LIBS) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,hsl) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,hsl) $@ diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index a8bdf0d4ae..c6c64c9358 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -155,34 +155,34 @@ $(LIBDIR)/libdeal_II_3d$(static-lib-suffix): $(o-files-3d) $(LIBDIR)/libdeal_II_1d.g$(shared-lib-suffix): $(go-files-1d) @echo "=====deal.II====1d====debug======$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_1d.g) $(call DEAL_II_ADD_SONAME,deal_II_1d.g) $(go-files-1d) $(deplibs.g) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_1d.g) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II_1d.g) $@ $(LIBDIR)/libdeal_II_1d$(shared-lib-suffix): $(o-files-1d) @echo "=====deal.II====1d====optimized==$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_1d) $(call DEAL_II_ADD_SONAME,deal_II_1d) $(o-files-1d) $(deplibs.o) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_1d) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II_1d) $@ $(LIBDIR)/libdeal_II_2d.g$(shared-lib-suffix): $(go-files-2d) @echo "=====deal.II====2d====debug======$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_2d.g) $(call DEAL_II_ADD_SONAME,deal_II_2d.g) $(go-files-2d) $(deplibs.g) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_2d.g) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II_2d.g) $@ $(LIBDIR)/libdeal_II_2d$(shared-lib-suffix): $(o-files-2d) @echo "=====deal.II====2d====optimized==$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_2d) $(call DEAL_II_ADD_SONAME,deal_II_2d) $(o-files-2d) $(deplibs.o) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_2d) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II_2d) $@ $(LIBDIR)/libdeal_II_3d.g$(shared-lib-suffix): $(go-files-3d) @echo "=====deal.II====3d====debug======$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_3d.g) $(call DEAL_II_ADD_SONAME,deal_II_3d.g) $(go-files-3d) $(deplibs.g) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_3d.g) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II_3d.g) $@ $(LIBDIR)/libdeal_II_3d$(shared-lib-suffix): $(o-files-3d) @echo "=====deal.II====3d====optimized==$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_3d) $(call DEAL_II_ADD_SONAME,deal_II_3d) $(o-files-3d) $(deplibs.o) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,deal_II_3d) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,deal_II_3d) $@ diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index ba20809b24..aa8ee1fe6b 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -112,12 +112,12 @@ $(LIBDIR)/liblac.g$(static-lib-suffix): $(go-files) $(LIBDIR)/liblac$(shared-lib-suffix): $(o-files) @echo "=====lac==============optimized==$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,lac) $(call DEAL_II_ADD_SONAME,lac) $(o-files) $(deplibs.o) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,lac) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,lac) $@ $(LIBDIR)/liblac.g$(shared-lib-suffix): $(go-files) @echo "=====lac==============debug======$(MT)== Linking library: $(@F)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,lac.g) $(call DEAL_II_ADD_SONAME,lac.g) $(go-files) $(deplibs.g) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,lac.g) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,lac.g) $@ clean: diff --git a/deal.II/lib/Makefile b/deal.II/lib/Makefile index 0d227a101e..4a76106284 100644 --- a/deal.II/lib/Makefile +++ b/deal.II/lib/Makefile @@ -62,12 +62,12 @@ ifeq ($(enable-shared),yes) libpetscall.g$(shared-lib-suffix): $(xlib.g) @echo "======================debug============= Linking library: libpetscall.g$(shared-lib-suffix)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,petscall.g) $(call DEAL_II_ADD_SONAME,petscall.g) $(xlib.g) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,petscall.g) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,petscall.g) $@ libpetscall$(shared-lib-suffix): $(xlib.o) @echo "======================optimized========= Linking library: libpetscall$(shared-lib-suffix)" @$(SHLIBLD) $(LDFLAGS) $(SHLIBFLAGS) -o $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,petscall) $(call DEAL_II_ADD_SONAME,petscall) $(xlib.o) - @ln -f -s $(LIBDIR)/$(call DEAL_II_SHLIB_NAME,petscall) $@ + @ln -f -s $(call DEAL_II_SHLIB_NAME,petscall) $@ else