From 6a10116aa08042561a78cf0ca656ce45ce406203 Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 22 Sep 2012 00:45:43 +0000 Subject: [PATCH] Bugfix for Bugfix. *Grrr* git-svn-id: https://svn.dealii.org/branches/branch_cmake@26626 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/config/Make.global_options.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/deal.II/config/Make.global_options.in b/deal.II/config/Make.global_options.in index 799df43293..407ca83e74 100644 --- a/deal.II/config/Make.global_options.in +++ b/deal.II/config/Make.global_options.in @@ -15,9 +15,9 @@ # path, so we just use the latter mechanism and leave LIBS empty for now. # # - The link line "$(CXX) -o $@ $(LIBS) $(LDFLAGS)" -# of the examples is broken. LDFLAGS should be in front. As a workaround, -# we have to specify the rpath flags ${MAKEFILE_RPATHFLAGS} directly in -# front of the libraries. +# of the examples is broken. LDFLAGS should be in front. +# +# TODO: Move all the target libraries to the LIBS variable. # # TODO: Set up the other configuration variables that are currently # removed... @@ -33,8 +33,7 @@ CC-ID = @CMAKE_C_COMPILER_ID@ CC-VERSION = @CMAKE_C_COMPILER_VERSION@ AR = @CMAKE_AR@ RANLIB = @CMAKE_RANLIB@ -LDFLAGS = @MAKEFILE_LDFLAGS@ - +LDFLAGS = @MAKEFILE_LDFLAGS@ @MAKEFILE_RPATHFLAGS@ LIBS = #Empty LIBDIR = @CMAKE_INSTALL_PREFIX@/@DEAL_II_LIBRARY_RELDIR@ @@ -76,8 +75,8 @@ EXEEXT = @EXEEXT@ # TODO # set paths to all the libraries we need: -lib-deal2.o = ${MAKEFILE_RPATHFLAGS} ${MAKEFILE_LIBRARIES} -lib-deal2.g = ${MAKEFILE_RPATHFLAGS} ${MAKEFILE_LIBRARIES} +lib-deal2.o = ${MAKEFILE_LIBRARIES} +lib-deal2.g = ${MAKEFILE_LIBRARIES} # necessary includes: -- 2.39.5