From: guido Date: Wed, 14 Mar 2001 17:34:27 +0000 (+0000) Subject: separate directory for ALL libraries deal.II/lib X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=851db992962c14b52d16b7fc7bcf27576103a91d;p=dealii-svn.git separate directory for ALL libraries deal.II/lib git-svn-id: https://svn.dealii.org/trunk@4208 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/.cvsignore b/deal.II/.cvsignore index ac04fc9077..aba7b652a7 100644 --- a/deal.II/.cvsignore +++ b/deal.II/.cvsignore @@ -1,3 +1,4 @@ config.log config.status TODO +lib diff --git a/deal.II/Makefile b/deal.II/Makefile index 59ccf51498..28dc64b8c5 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -72,6 +72,11 @@ lac: cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 3d +$(LIBDIR): + mkdir $@ + +baseg base lacg lac 1dg 1d 2dg 2d 3dg 3d all debug contrib : $(LIBDIR) + all: contrib cd $D/base ; $(MAKE) $(MAKEOPTIONS) libg cd $D/base ; $(MAKE) $(MAKEOPTIONS) lib diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index c7fcbd82d1..04771f90c3 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -67,28 +67,30 @@ lib/o/%.o : # rules ifeq ($(enable-shared),yes) - lib: lib/libbase.g.so lib/libbase.so - libg: lib/libbase.g.so + lib: $(LIBDIR)/libbase.g.so $(LIBDIR)/libbase.so + libg: $(LIBDIR)/libbase.g.so + libo: $(LIBDIR)/libbase.so else - lib: lib/libbase.g.a lib/libbase.a - libg: lib/libbase.g.a + lib: $(LIBDIR)/libbase.g.a $(LIBDIR)/libbase.a + libg: $(LIBDIR)/libbase.g.a + libo: $(LIBDIR)/libbase.so endif -lib/libbase.a: $(forward-declarations) $(o-files) +$(LIBDIR)/libbase.a: $(forward-declarations) $(o-files) @echo =====base=============optimized==$(MT)== Linking library: $@ @ar ruv $@ $(o-files) -lib/libbase.g.a: $(forward-declarations) $(go-files) +$(LIBDIR)/libbase.g.a: $(forward-declarations) $(go-files) @echo =====base=============debug======$(MT)== Linking library: $@ @ar ruv $@ $(go-files) -lib/libbase.so: $(forward-declarations) $(o-files) +$(LIBDIR)/libbase.so: $(forward-declarations) $(o-files) @echo =====base=============optimized==$(MT)== Linking library: $@ @$(CC) $(CXXFLAGS.o) -shared -o $@ $(o-files) -lib/libbase.g.so: $(forward-declarations) $(go-files) +$(LIBDIR)/libbase.g.so: $(forward-declarations) $(go-files) @echo =====base=============debug======$(MT)== Linking library: $@ @$(CC) $(CXXFLAGS.g) -shared -o $@ $(go-files) @@ -96,10 +98,10 @@ lib/libbase.g.so: $(forward-declarations) $(go-files) clean: - -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go \ - include/base/forward_declarations.h* lib/Makefile.dep - + -rm -f *~ include/*~ include/*/*~ lib/o/*.o lib/go/*.go +veryclean: clean + -rm include/base/forward_declarations.h* lib/Makefile.dep #Rule to generate the dependency file. This file is #automagically remade whenever needed, i.e. whenever @@ -124,5 +126,5 @@ include lib/Makefile.dep include $D/common/scripts/forward_declarations -.PHONY: clean +.PHONY: clean veryclean .PHONY: lib lib.a lib.g.a diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 1b5c0d16a3..d49117149d 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -27,6 +27,7 @@ F77 = @F77@ F77-VERSION = @F77_VERSION@ F77LDFLAGS = @F77LDFLAGS@ LIBS = @LIBS@ +LIBDIR = $D/lib PERL = @PERL@ enable-multithreading= @enablemultithreading@ with-multithreading = @withmultithreading@ @@ -45,24 +46,21 @@ endif # path for libraries -lib-path-base = $D/base/lib -lib-path-lac = $D/lac/lib -lib-path-deal2 = $D/deal.II/lib lib-path-contrib-hsl = $D/contrib/hsl/lib -LIBPATH += $(addprefix -L,$(lib-path-base) $(lib-path-lac) $(lib-path-deal2)) +LIBPATH += $(addprefix -L,$(libdir)) # add search path for libraries for make dependencies -vpath %.a $(lib-path-base) -vpath %.a $(lib-path-lac) -vpath %.a $(lib-path-deal2) +vpath %.a $(libdir) +vpath %.so $(libdir) # if HSL sublibs are used, add them to the path ifeq ($(USE_CONTRIB_HSL),yes) LIBPATH += $(addprefix -L,$(lib-path-contrib-hsl)) vpath %.a $(lib-path-contrib-hsl) + vpath %.so $(lib-path-contrib-hsl) endif @@ -71,19 +69,19 @@ endif lib-suffix = @lib_suffix@ -lib-base.o = $(lib-path-base)/libbase$(lib-suffix) -lib-base.g = $(lib-path-base)/libbase.g$(lib-suffix) +lib-base.o = $(LIBDIR)/libbase$(lib-suffix) +lib-base.g = $(LIBDIR)/libbase.g$(lib-suffix) -lib-lac.o = $(lib-path-lac)/liblac$(lib-suffix) -lib-lac.g = $(lib-path-lac)/liblac.g$(lib-suffix) +lib-lac.o = $(LIBDIR)/liblac$(lib-suffix) +lib-lac.g = $(LIBDIR)/liblac.g$(lib-suffix) -lib-deal2-1d.o = $(lib-path-deal2)/libdeal_II_1d$(lib-suffix) -lib-deal2-2d.o = $(lib-path-deal2)/libdeal_II_2d$(lib-suffix) -lib-deal2-3d.o = $(lib-path-deal2)/libdeal_II_3d$(lib-suffix) +lib-deal2-1d.o = $(LIBDIR)/libdeal_II_1d$(lib-suffix) +lib-deal2-2d.o = $(LIBDIR)/libdeal_II_2d$(lib-suffix) +lib-deal2-3d.o = $(LIBDIR)/libdeal_II_3d$(lib-suffix) -lib-deal2-1d.g = $(lib-path-deal2)/libdeal_II_1d.g$(lib-suffix) -lib-deal2-2d.g = $(lib-path-deal2)/libdeal_II_2d.g$(lib-suffix) -lib-deal2-3d.g = $(lib-path-deal2)/libdeal_II_3d.g$(lib-suffix) +lib-deal2-1d.g = $(LIBDIR)/libdeal_II_1d.g$(lib-suffix) +lib-deal2-2d.g = $(LIBDIR)/libdeal_II_2d.g$(lib-suffix) +lib-deal2-3d.g = $(LIBDIR)/libdeal_II_3d.g$(lib-suffix) lib-contrib-hsl = $(lib-path-contrib-hsl)/libhsl$(lib-suffix) diff --git a/deal.II/configure b/deal.II/configure index 40ec65d081..4808fc7911 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.57 +# From configure.in Revision: 1.59 @@ -576,7 +576,6 @@ fi - DEAL2_DIR=`pwd` @@ -642,7 +641,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:646: checking host system type" >&5 +echo "configure:645: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -663,7 +662,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:667: checking target system type" >&5 +echo "configure:666: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -681,7 +680,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:685: checking build system type" >&5 +echo "configure:684: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -719,7 +718,7 @@ cross_compiling=$ac_cv_prog_cxx_cross # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:723: checking for $ac_word" >&5 +echo "configure:722: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -749,7 +748,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:753: checking for $ac_word" >&5 +echo "configure:752: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -800,7 +799,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:804: checking for $ac_word" >&5 +echo "configure:803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -832,7 +831,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:836: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:835: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -843,12 +842,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 847 "configure" +#line 846 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -874,12 +873,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:878: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:877: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:883: checking whether we are using GNU C" >&5 +echo "configure:882: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -888,7 +887,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -907,7 +906,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:911: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:910: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -941,7 +940,7 @@ fi # Extract the first word of "$CC", so it can be a program name with args. set dummy $CC; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:945: checking for $ac_word" >&5 +echo "configure:944: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -982,7 +981,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:986: checking for $ac_word" >&5 +echo "configure:985: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1014,7 +1013,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1018: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1017: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1025,12 +1024,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1029 "configure" +#line 1028 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1056,12 +1055,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1060: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1059: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1065: checking whether we are using GNU C++" >&5 +echo "configure:1064: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1070,7 +1069,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1089,7 +1088,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1093: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1092: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1124,7 +1123,7 @@ CXXFLAGS="$OLDCXXFLAGS" # Extract the first word of "$CXX", so it can be a program name with args. set dummy $CXX; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1128: checking for $ac_word" >&5 +echo "configure:1127: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,12 +1310,12 @@ fi if test "$GXX" = yes ; then echo $ac_n "checking whether -ggdb works for long symbols""... $ac_c" 1>&6 -echo "configure:1315: checking whether -ggdb works for long symbols" >&5 +echo "configure:1314: checking whether -ggdb works for long symbols" >&5 case "$target" in alpha*-osf*) CXXFLAGS="-ggdb $CXXFLAGSG" cat > conftest.$ac_ext < @@ -1337,7 +1336,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CXXFLAGSG="-ggdb $CXXFLAGSG" @@ -1409,7 +1408,7 @@ if test "$enablemultithreading" = yes ; then if test "$GXX" = yes ; then echo $ac_n "checking for platform specific thread flags""... $ac_c" 1>&6 -echo "configure:1413: checking for platform specific thread flags" >&5 +echo "configure:1412: checking for platform specific thread flags" >&5 for i in threads mt pthread pthreads mthreads Kthread kthread invalid_last_entry; do CXXFLAGS="$CXXFLAGSG -$i" @@ -1445,7 +1444,7 @@ echo "configure:1413: checking for platform specific thread flags" >&5 echo $ac_n "checking for platform specific multi-threading defines""... $ac_c" 1>&6 -echo "configure:1449: checking for platform specific multi-threading defines" >&5 +echo "configure:1448: checking for platform specific multi-threading defines" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1454,7 +1453,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""not necessary"" 1>&6 @@ -1519,7 +1518,7 @@ fi if test "$withmultithreading" != no ; then echo $ac_n "checking for ACE""... $ac_c" 1>&6 -echo "configure:1523: checking for ACE" >&5 +echo "configure:1522: checking for ACE" >&5 if test -d "$withmultithreading" ; then echo "$ac_t""found" 1>&6 else @@ -1540,7 +1539,7 @@ fi if test "$enablemultithreading" = yes ; then if test "$GXX" = yes ; then echo $ac_n "checking whether compilation with ACE disallows flags""... $ac_c" 1>&6 -echo "configure:1544: checking whether compilation with ACE disallows flags" >&5 +echo "configure:1543: checking whether compilation with ACE disallows flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1550,7 +1549,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="-ansi -I$withmultithreading" cat > conftest.$ac_ext < @@ -1560,7 +1559,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_ace_remove_ansi="no" @@ -1576,7 +1575,7 @@ fi rm -f conftest* CXXFLAGS="-pedantic -Werror -I$withmultithreading" cat > conftest.$ac_ext < @@ -1586,7 +1585,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_ace_remove_pedantic="no" @@ -1630,7 +1629,7 @@ fi echo $ac_n "checking whether AssertThrow works with debug flags""... $ac_c" 1>&6 -echo "configure:1634: checking whether AssertThrow works with debug flags" >&5 +echo "configure:1633: checking whether AssertThrow works with debug flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1640,7 +1639,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSG cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1668,7 +1667,7 @@ fi rm -f conftest* echo $ac_n "checking whether AssertThrow works with optimized flags""... $ac_c" 1>&6 -echo "configure:1672: checking whether AssertThrow works with optimized flags" >&5 +echo "configure:1671: checking whether AssertThrow works with optimized flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1678,7 +1677,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSO cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1707,7 +1706,7 @@ rm -f conftest* echo $ac_n "checking for std::vector bug""... $ac_c" 1>&6 -echo "configure:1711: checking for std::vector bug" >&5 +echo "configure:1710: checking for std::vector bug" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1717,7 +1716,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -1758,7 +1757,7 @@ rm -f conftest* echo $ac_n "checking for std::iterator class""... $ac_c" 1>&6 -echo "configure:1762: checking for std::iterator class" >&5 +echo "configure:1761: checking for std::iterator class" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1768,7 +1767,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext < @@ -1779,7 +1778,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -1800,7 +1799,7 @@ rm -f conftest* echo $ac_n "checking whether lrand48 needs to be declared with -ansi""... $ac_c" 1>&6 -echo "configure:1804: checking whether lrand48 needs to be declared with -ansi" >&5 +echo "configure:1803: checking whether lrand48 needs to be declared with -ansi" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1810,7 +1809,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" cat > conftest.$ac_ext < @@ -1826,7 +1825,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -1847,7 +1846,7 @@ rm -f conftest* echo $ac_n "checking whether getrusage is properly declared""... $ac_c" 1>&6 -echo "configure:1851: checking whether getrusage is properly declared" >&5 +echo "configure:1850: checking whether getrusage is properly declared" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1856,7 +1855,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < @@ -1868,7 +1867,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1872: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1887,7 +1886,7 @@ rm -f conftest* echo $ac_n "checking whether isnan is declared with debug flags""... $ac_c" 1>&6 -echo "configure:1891: checking whether isnan is declared with debug flags" >&5 +echo "configure:1890: checking whether isnan is declared with debug flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -1898,7 +1897,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSG deal_II_isnan_flag="" cat > conftest.$ac_ext < @@ -1910,7 +1909,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1926,7 +1925,7 @@ rm -f conftest* if test "x$deal_II_isnan_flag" = "x" ; then cat > conftest.$ac_ext < @@ -1938,7 +1937,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -1958,7 +1957,7 @@ rm -f conftest* for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSG $testflag" cat > conftest.$ac_ext < @@ -1970,7 +1969,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -1983,7 +1982,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -1995,7 +1994,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:1999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -2017,7 +2016,7 @@ rm -f conftest* fi echo $ac_n "checking whether isnan is declared with optimized flags""... $ac_c" 1>&6 -echo "configure:2021: checking whether isnan is declared with optimized flags" >&5 +echo "configure:2020: checking whether isnan is declared with optimized flags" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' @@ -2028,7 +2027,7 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS=$CXXFLAGSO deal_II_isnan_flag="" cat > conftest.$ac_ext < @@ -2040,7 +2039,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -2056,7 +2055,7 @@ rm -f conftest* if test "x$deal_II_isnan_flag" = "x" ; then cat > conftest.$ac_ext < @@ -2068,7 +2067,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t"""yes"" 1>&6 @@ -2088,7 +2087,7 @@ rm -f conftest* for testflag in -D_ISOC99_SOURCE -D__EXTENSIONS__ ; do CXXFLAGS="$CXXFLAGSO $testflag" cat > conftest.$ac_ext < @@ -2100,7 +2099,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_ISNAN $testflag" @@ -2113,7 +2112,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < @@ -2125,7 +2124,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* deal_II_isnan_flag="-DHAVE_UNDERSCORE_ISNAN $testflag" @@ -2155,7 +2154,7 @@ rm -f conftest* # Extract the first word of "f77", so it can be a program name with args. set dummy f77; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2159: checking for $ac_word" >&5 +echo "configure:2158: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2191,7 +2190,7 @@ if test "x$F77" = "x" ; then # Extract the first word of "g77", so it can be a program name with args. set dummy g77; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2195: checking for $ac_word" >&5 +echo "configure:2194: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_F77'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2337,7 +2336,7 @@ fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2341: checking for $ac_word" >&5 +echo "configure:2340: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2375,7 +2374,7 @@ fi echo $ac_n "checking for HSL subroutines""... $ac_c" 1>&6 -echo "configure:2379: checking for HSL subroutines" >&5 +echo "configure:2378: checking for HSL subroutines" >&5 hsl_subroutines="" if test -r contrib/hsl/source/ma27.f ; then hsl_subroutines="$hsl_subroutines MA27" @@ -2410,7 +2409,7 @@ if test "${with_blas+set}" = set; then withval="$with_blas" if test "$withval" != no ; then echo $ac_n "checking for BLAS""... $ac_c" 1>&6 -echo "configure:2414: checking for BLAS" >&5 +echo "configure:2413: checking for BLAS" >&5 if test -r "$withval" ; then echo "$ac_t""found" 1>&6 else @@ -2425,23 +2424,30 @@ EOF fi else - echo $ac_n "checking for main in -lblas""... $ac_c" 1>&6 -echo "configure:2430: checking for main in -lblas" >&5 -ac_lib_var=`echo blas'_'main | sed 'y%./+-%__p_%'` + echo $ac_n "checking for daxpy_ in -lblas""... $ac_c" 1>&6 +echo "configure:2429: checking for daxpy_ in -lblas" >&5 +ac_lib_var=`echo blas'_'daxpy_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lblas $LIBS" +LIBS="-lblas -lg2c $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2473,7 +2479,7 @@ if test "${with_lapack+set}" = set; then withval="$with_lapack" if test "$withval" != no ; then echo $ac_n "checking for LAPACK""... $ac_c" 1>&6 -echo "configure:2477: checking for LAPACK" >&5 +echo "configure:2483: checking for LAPACK" >&5 if test -r "$withval" ; then echo "$ac_t""found" 1>&6 else @@ -2489,7 +2495,7 @@ EOF else echo $ac_n "checking for dgels_ in -llapack""... $ac_c" 1>&6 -echo "configure:2493: checking for dgels_ in -llapack" >&5 +echo "configure:2499: checking for dgels_ in -llapack" >&5 ac_lib_var=`echo lapack'_'dgels_ | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2497,7 +2503,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llapack $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2578,7 +2584,7 @@ else fi echo $ac_n "checking for kdoc""... $ac_c" 1>&6 -echo "configure:2582: checking for kdoc" >&5 +echo "configure:2588: checking for kdoc" >&5 if test "$kdocdir" != ${DEAL2_DIR}/contrib/kdoc/bin ; then if test -r $kdocdir/kdoc ; then echo "$ac_t""found" 1>&6 @@ -2614,7 +2620,7 @@ if test "$docxx" = to-be-determined ; then # Extract the first word of ""doc++"", so it can be a program name with args. set dummy "doc++"; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2618: checking for $ac_word" >&5 +echo "configure:2624: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_docxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2648,7 +2654,7 @@ fi else echo $ac_n "checking for doc++""... $ac_c" 1>&6 -echo "configure:2652: checking for doc++" >&5 +echo "configure:2658: checking for doc++" >&5 if test -x "$docxx" ; then echo "$ac_t""yes" 1>&6 else @@ -2671,16 +2677,16 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXFLAGS="$CXXFLAGSG" echo $ac_n "checking for consistency of CXXFLAGSG flags""... $ac_c" 1>&6 -echo "configure:2675: checking for consistency of CXXFLAGSG flags" >&5 +echo "configure:2681: checking for consistency of CXXFLAGSG flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 @@ -2698,16 +2704,16 @@ rm -f conftest* CXXFLAGS="$CXXFLAGSO" echo $ac_n "checking for consistency of CXXFLAGSO flags""... $ac_c" 1>&6 -echo "configure:2702: checking for consistency of CXXFLAGSO flags" >&5 +echo "configure:2708: checking for consistency of CXXFLAGSO flags" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 diff --git a/deal.II/configure.in b/deal.II/configure.in index a18564b35d..62261b2e50 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -17,7 +17,6 @@ define([AC_CACHE_SAVE], )dnl AC_REVISION($Revision$) AC_INIT(base) - dnl Set the path to the deal.II libraries to `pwd` DEAL2_DIR=`pwd` AC_SUBST(DEAL2_DIR) diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 39611def31..1f327d8c51 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -17,19 +17,19 @@ all: 2dg 2d 3dg 3d 1dg 1d ifeq ($(enable-shared),yes) - 1dg: lib/libdeal_II_1d.g.so - 1d : lib/libdeal_II_1d.so - 2dg: lib/libdeal_II_2d.g.so - 2d : lib/libdeal_II_2d.so - 3dg: lib/libdeal_II_3d.g.so - 3d : lib/libdeal_II_3d.so + 1dg: $(LIBDIR)/libdeal_II_1d.g.so + 1d : $(LIBDIR)/libdeal_II_1d.so + 2dg: $(LIBDIR)/libdeal_II_2d.g.so + 2d : $(LIBDIR)/libdeal_II_2d.so + 3dg: $(LIBDIR)/libdeal_II_3d.g.so + 3d : $(LIBDIR)/libdeal_II_3d.so else - 1dg: lib/libdeal_II_1d.g.a - 1d : lib/libdeal_II_1d.a - 2dg: lib/libdeal_II_2d.g.a - 2d : lib/libdeal_II_2d.a - 3dg: lib/libdeal_II_3d.g.a - 3d : lib/libdeal_II_3d.a + 1dg: $(LIBDIR)/libdeal_II_1d.g.a + 1d : $(LIBDIR)/libdeal_II_1d.a + 2dg: $(LIBDIR)/libdeal_II_2d.g.a + 2d : $(LIBDIR)/libdeal_II_2d.a + 3dg: $(LIBDIR)/libdeal_II_3d.g.a + 3d : $(LIBDIR)/libdeal_II_3d.a endif @@ -92,53 +92,53 @@ lib/3d/o/%.o : # rules how to make the libraries themselves -lib/libdeal_II_1d.g.a: $(go-files-1d) +$(LIBDIR)/libdeal_II_1d.g.a: $(go-files-1d) @echo =====deal.II====1d====debug======$(MT)== Linking library: $(@F) @ar ruv $@ $(go-files-1d) -lib/libdeal_II_1d.a: $(o-files-1d) +$(LIBDIR)/libdeal_II_1d.a: $(o-files-1d) @echo =====deal.II====1d====optimized==$(MT)== Linking library: $(@F) @ar ruv $@ $(o-files-1d) -lib/libdeal_II_2d.g.a: $(go-files-2d) +$(LIBDIR)/libdeal_II_2d.g.a: $(go-files-2d) @echo =====deal.II====2d====debug======$(MT)== Linking library: $(@F) @ar ruv $@ $(go-files-2d) -lib/libdeal_II_2d.a: $(o-files-2d) +$(LIBDIR)/libdeal_II_2d.a: $(o-files-2d) @echo =====deal.II====2d====optimized==$(MT)== Linking library: $(@F) @ar ruv $@ $(o-files-2d) -lib/libdeal_II_3d.g.a: $(go-files-3d) +$(LIBDIR)/libdeal_II_3d.g.a: $(go-files-3d) @echo =====deal.II====3d====debug======$(MT)== Linking library: $(@F) @ar ruv $@ $(go-files-3d) -lib/libdeal_II_3d.a: $(o-files-3d) +$(LIBDIR)/libdeal_II_3d.a: $(o-files-3d) @echo =====deal.II====3d====optimized==$(MT)== Linking library: $(@F) @ar ruv $@ $(o-files-3d) -lib/libdeal_II_1d.g.so: $(go-files-1d) +$(LIBDIR)/libdeal_II_1d.g.so: $(go-files-1d) @echo =====deal.II====1d====debug======$(MT)== Linking library: $(@F) @$(CC) $(CXXFLAGS.o) -shared -o $@ $(go-files-1d) -lib/libdeal_II_1d.so: $(o-files-1d) +$(LIBDIR)/libdeal_II_1d.so: $(o-files-1d) @echo =====deal.II====1d====optimized==$(MT)== Linking library: $(@F) @$(CC) $(CXXFLAGS.o) -shared -o $@ $(o-files-1d) -lib/libdeal_II_2d.g.so: $(go-files-2d) +$(LIBDIR)/libdeal_II_2d.g.so: $(go-files-2d) @echo =====deal.II====2d====debug======$(MT)== Linking library: $(@F) @$(CC) $(CXXFLAGS.o) -shared -o $@ $(go-files-2d) -lib/libdeal_II_2d.so: $(o-files-2d) +$(LIBDIR)/libdeal_II_2d.so: $(o-files-2d) @echo =====deal.II====2d====optimized==$(MT)== Linking library: $(@F) @$(CC) $(CXXFLAGS.o) -shared -o $@ $(o-files-2d) -lib/libdeal_II_3d.g.so: $(go-files-3d) +$(LIBDIR)/libdeal_II_3d.g.so: $(go-files-3d) @echo =====deal.II====3d====debug======$(MT)== Linking library: $(@F) @$(CC) $(CXXFLAGS.o) -shared -o $@ $(go-files-3d) -lib/libdeal_II_3d.so: $(o-files-3d) +$(LIBDIR)/libdeal_II_3d.so: $(o-files-3d) @echo =====deal.II====3d====optimized==$(MT)== Linking library: $(@F) @$(CC) $(CXXFLAGS.o) -shared -o $@ $(o-files-3d) @@ -174,9 +174,11 @@ include $D/common/scripts/forward_declarations ################### some clean-up rules clean: - -rm -f *~ */*~ */*/*~ include/grid/forward_declarations.h* + -rm -f *~ */*~ */*/*~ cd lib ; $(MAKE) clean +veryclean: clean + -rm -f include/grid/forward_declarations.h* ################### diff --git a/deal.II/doc/news/2001/c-3-1.html b/deal.II/doc/news/2001/c-3-1.html index 372c168edc..45dd84fbe9 100644 --- a/deal.II/doc/news/2001/c-3-1.html +++ b/deal.II/doc/news/2001/c-3-1.html @@ -26,6 +26,15 @@ documentation, etc.

General

    +
  1. + Improved: libraries are now all in a subdirectory lib in the + deal.II home directory. It is now easy to + make this directory a link to put the libraries on a faster + disk. +
    + (GK 2001/03/14) +

    +
  2. New: The finite element classes have been redesigned from scratch to allow also elements that depend on the actual cell diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index 501f45a9d5..8ce1fb2b66 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -40,38 +40,39 @@ lib/o/%.o : # rules ifeq ($(enable-shared),yes) - lib: lib/liblac.g.so lib/liblac.so - libg: lib/liblac.g.so + lib: $(LIBDIR)/liblac.g.so $(LIBDIR)/liblac.so + libg: $(LIBDIR)/liblac.g.so else - lib: lib/liblac.g.a lib/liblac.a - libg: lib/liblac.g.a + lib: $(LIBDIR)/liblac.g.a $(LIBDIR)/liblac.a + libg: $(LIBDIR)/liblac.g.a endif -lib/liblac.a: $(forward-declarations) $(o-files) +$(LIBDIR)/liblac.a: $(forward-declarations) $(o-files) @echo =====lac==============optimized==$(MT)== Linking library: $@ @ar ruv $@ $(o-files) -lib/liblac.g.a: $(forward-declarations) $(go-files) +$(LIBDIR)/liblac.g.a: $(forward-declarations) $(go-files) @echo =====lac==============debug======$(MT)== Linking library: $@ @ar ruv $@ $(go-files) -lib/liblac.so: $(forward-declarations) $(o-files) +$(LIBDIR)/liblac.so: $(forward-declarations) $(o-files) @echo =====lac==============optimized==$(MT)== Linking library: $@ @$(CC) $(CXXFLAGS.o) -shared -o $@ $(o-files) -lib/liblac.g.so: $(forward-declarations) $(go-files) +$(LIBDIR)/liblac.g.so: $(forward-declarations) $(go-files) @echo =====lac==============debug======$(MT)== Linking library: $@ @$(CC) $(CXXFLAGS.g) -shared -o $@ $(go-files) clean: - -rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go \ - include/base/forward_declarations.h* lib/Makefile.dep + -rm -f *~ include/*~ include/*/*~ lib/o/*.o lib/go/*.go +veryclean: clean + -rm include/base/forward_declarations.h* lib/Makefile.dep #Rule to generate the dependency file. This file is @@ -91,5 +92,5 @@ include lib/Makefile.dep include $D/common/scripts/forward_declarations -.PHONY: clean +.PHONY: clean veryclean .PHONY: lib lib.a lib.g.a