Hi, the following patch against deal.II SVN -r17340 makes the unversioned-to-versioned-library symlinks in the lib/ directory point to relative filenames instead of absolute ones.
Essentially, the patch removes the explicit $(LIBDIR)/ prefix from the ln -s commands in the Makefile suite. This works because the symlinks are placed in the same directory as their targets. This patch makes it easier to move the generated library files around. People who want to make binary deal.II packages will need this. Making binary packages needs some more tweaks. I post this one because it does not hurt and therefore has a chance of getting included. Regards, -- Christian Cornelssen
Index: base/Makefile
===================================================================
--- base/Makefile (Revision 17340)
+++ base/Makefile (Arbeitskopie)
@@ -79,12 +79,12 @@
$(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) $@
Index: contrib/hsl/Makefile
===================================================================
--- contrib/hsl/Makefile (Revision 17340)
+++ contrib/hsl/Makefile (Arbeitskopie)
@@ -46,7 +46,7 @@
$(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) $@
Index: deal.II/Makefile
===================================================================
--- deal.II/Makefile (Revision 17340)
+++ deal.II/Makefile (Arbeitskopie)
@@ -155,34 +155,34 @@
$(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) $@
Index: lac/Makefile
===================================================================
--- lac/Makefile (Revision 17340)
+++ lac/Makefile (Arbeitskopie)
@@ -112,12 +112,12 @@
$(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:
Index: lib/Makefile
===================================================================
--- lib/Makefile (Revision 17340)
+++ lib/Makefile (Arbeitskopie)
@@ -62,12 +62,12 @@
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
signature.asc
Description: PGP signature
_______________________________________________
