From 923eb41ba3af55b3d409deba3e3720c6778c9b29 Mon Sep 17 00:00:00 2001 From: guido Date: Mon, 25 Apr 2005 20:34:00 +0000 Subject: [PATCH] handle shared flags by configure, not in Makefile git-svn-id: https://svn.dealii.org/trunk@10576 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 12 ------------ deal.II/configure | 8 ++++++++ deal.II/configure.in | 8 ++++++++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 9aaf4b61b1..59748babcf 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -172,18 +172,6 @@ F77FLAGS.o = @DEFS@ @F77FLAGSO@ $(INCLUDE) # compile flags for C compiler CFLAGS = @CFLAGS@ -ifeq ($(enable-shared),yes) - CXXFLAGS.g += @CXXFLAGSPIC@ - CXXFLAGS.o += @CXXFLAGSPIC@ - - F77FLAGS.g += @F77FLAGSPIC@ - F77FLAGS.o += @F77FLAGSPIC@ - - CFLAGS += @CFLAGSPIC@ - LDFLAGS += @LDFLAGSPIC@ -endif - - # PETSc wants to see a whole lot of other flags being passed. ... ifeq ($(USE_CONTRIB_PETSC),yes) include $(DEAL_II_PETSC_DIR)/bmake/$(DEAL_II_PETSC_ARCH)/variables diff --git a/deal.II/configure b/deal.II/configure index 6a2eb3d6ee..b2c3781b29 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -8655,6 +8655,14 @@ case "$target" in ;; esac +if test "x$enableshared" = "xyes" ; then + CFLAGS="$CFLAGS $CFLAGSPIC" + CXXFLAGSG="$CXXFLAGSG $CXXFLAGSPIC" + CXXFLAGSO="$CXXFLAGSO $CXXFLAGSPIC" + F77FLAGSG="$F77FLAGSG $F77FLAGSPIC" + F77FLAGSO="$F77FLAGSO $F77FLAGSPIC" +fi + diff --git a/deal.II/configure.in b/deal.II/configure.in index 71e7a7a168..280e4fa491 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -287,6 +287,14 @@ case "$target" in ;; esac +if test "x$enableshared" = "xyes" ; then + CFLAGS="$CFLAGS $CFLAGSPIC" + CXXFLAGSG="$CXXFLAGSG $CXXFLAGSPIC" + CXXFLAGSO="$CXXFLAGSO $CXXFLAGSPIC" + F77FLAGSG="$F77FLAGSG $F77FLAGSPIC" + F77FLAGSO="$F77FLAGSO $F77FLAGSPIC" +fi + AC_SUBST(enableshared) AC_SUBST(static_lib_suffix) AC_SUBST(shared_lib_suffix) -- 2.39.5