]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
handle shared flags by configure, not in Makefile
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 25 Apr 2005 20:34:00 +0000 (20:34 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 25 Apr 2005 20:34:00 +0000 (20:34 +0000)
git-svn-id: https://svn.dealii.org/trunk@10576 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in
deal.II/configure
deal.II/configure.in

index 9aaf4b61b1d51f18413bfac25ad924e0e6b01853..59748babcf99c4d5b7de3a23be0a8c98bfc08022 100644 (file)
@@ -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
index 6a2eb3d6ee7bfa92f5896c6f05e5b228dc0eef95..b2c3781b2965cb8988fa7ef538d366552361d53b 100755 (executable)
@@ -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
+
 
 
 
index 71e7a7a168962df235c46fe39cd116e8576e478b..280e4fa491c79e2c800d70d0235cdf6c668d9cba 100644 (file)
@@ -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)

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.