From: Wolfgang Bangerth Date: Wed, 23 May 2001 08:09:42 +0000 (+0000) Subject: Use LDFLAGS to link libraries, rather than CXXFLAGS.o or .g X-Git-Tag: v8.0.0~19086 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5d64edc0ee9f6b7fefb505cf4b9e22ba43e8e2d;p=dealii.git Use LDFLAGS to link libraries, rather than CXXFLAGS.o or .g git-svn-id: https://svn.dealii.org/trunk@4708 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index e9773774d9..b4702bc7d0 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -88,11 +88,11 @@ $(LIBDIR)/libbase.g.a: $(forward-declarations) $(go-files) $(LIBDIR)/libbase.so: $(forward-declarations) $(o-files) @echo =====base=============optimized==$(MT)== Linking library: $(@F) - @$(CC) $(CXXFLAGS.o) -shared -o $@ $(o-files) + @$(CC) $(LDFLAGS) -shared -o $@ $(o-files) $(LIBDIR)/libbase.g.so: $(forward-declarations) $(go-files) @echo =====base=============debug======$(MT)== Linking library: $(@F) - @$(CC) $(CXXFLAGS.g) -shared -o $@ $(go-files) + @$(CC) $(LDFLAGS) -shared -o $@ $(go-files) diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 4ceae7e5ab..b4c7e99b67 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -118,29 +118,29 @@ $(LIBDIR)/libdeal_II_3d.a: $(o-files-3d) $(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) + @$(CC) $(LDFLAGS) -shared -o $@ $(go-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) + @$(CC) $(LDFLAGS) -shared -o $@ $(o-files-1d) $(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) + @$(CC) $(LDFLAGS) -shared -o $@ $(go-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) + @$(CC) $(LDFLAGS) -shared -o $@ $(o-files-2d) $(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) + @$(CC) $(LDFLAGS) -shared -o $@ $(go-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) + @$(CC) $(LDFLAGS) -shared -o $@ $(o-files-3d) diff --git a/deal.II/doc/news/2001/c-3-1.html b/deal.II/doc/news/2001/c-3-1.html index ffaeba49ac..4c8d7e7444 100644 --- a/deal.II/doc/news/2001/c-3-1.html +++ b/deal.II/doc/news/2001/c-3-1.html @@ -27,12 +27,20 @@ documentation, etc.
  1. - Change: If in multithreaded mode, the ACE library is now + Changed: The libraries are no more linked using the C++ + compilation flags, but rather using LDFLAGS. Some compilers + object to compilation flags on the linker line. +
    + (WB 2001/05/23) +

    + +
  2. + Changed: If in multithreaded mode, the ACE library is now automatically added to the $(LIBS) Makefile variable. There is no need anymore for a special clause in your Makefile.
    - (WB 2001/05/22) + (WB 2001/05/23)

  3. diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index aaa2fc90b0..e48913b8b9 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -60,11 +60,11 @@ $(LIBDIR)/liblac.g.a: $(forward-declarations) $(go-files) $(LIBDIR)/liblac.so: $(forward-declarations) $(o-files) @echo =====lac==============optimized==$(MT)== Linking library: $(@F) - @$(CC) $(CXXFLAGS.o) -shared -o $@ $(o-files) + @$(CC) $(LDFLAGS) -shared -o $@ $(o-files) $(LIBDIR)/liblac.g.so: $(forward-declarations) $(go-files) @echo =====lac==============debug======$(MT)== Linking library: $(@F) - @$(CC) $(CXXFLAGS.g) -shared -o $@ $(go-files) + @$(CC) $(LDFLAGS) -shared -o $@ $(go-files)