Mercurial > fem-fenics-eugenio

changeset 229:194f8c66b45a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add unused compiler/linker flags * src/configure.ac: obtain from pkg-config all the missing flags. * src/Makefile.in: add apices to linker flags and pass preprocessor flags as environment variable.
author Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
date Thu, 05 Jun 2014 19:50:52 +0200
parents c74309df3489
children 1a3674836579
files src/Makefile.in src/configure.ac
diffstat 2 files changed, 38 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.in	Thu May 29 10:58:17 2014 +0200
+++ b/src/Makefile.in	Thu Jun 05 19:50:52 2014 +0200
@@ -1,9 +1,9 @@
 MKOCTFILE ?= mkoctfile
 FFC ?= ffc
 
-CPPFLAGS=@DENSE_CPPFLAGS@ @DOLFIN_CPPFLAGS@ @EIGEN_CPPFLAGS@
-LDFLAGS=@EIGEN_LDFLAGS@ @DOLFIN_LDFLAGS@
-LIBS=@EIGEN_LIBS@ @DOLFIN_LIBS@
+CPPFLAGS='@DENSE_CPPFLAGS@ @DOLFIN_CPPFLAGS@ @EIGEN_CPPFLAGS@ -I.'
+LIBS_RAW=@EIGEN_LIBS@ @DOLFIN_LIBS@
+LIBS=$(patsubst %, "%", $(LIBS_RAW))
 
 OCTFILES= Mesh.oct \
              DirichletBC.oct \
@@ -19,63 +19,61 @@
              interpolate.oct
 
 
-LIBS += -ldolfin
-
 all: $(OCTFILES)
 
 fem_init_env.oct: fem_init_env.o
-	$(MKOCTFILE) $(CPPFLAGS) fem_init_env.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) fem_init_env.o -o $@ $(LIBS)
 
 fem_init_env.o:  fem_init_env.cc mesh.h functionspace.h boundarycondition.h function.h coefficient.h form.h
-	$(MKOCTFILE) $(CPPFLAGS) -c fem_init_env.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c fem_init_env.cc -o $@
 
 Mesh.oct: Mesh.o
-	$(MKOCTFILE) $(CPPFLAGS) Mesh.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) Mesh.o -o $@ $(LIBS)
 
 Mesh.o: Mesh.cc mesh.h
-	$(MKOCTFILE) $(CPPFLAGS) -c Mesh.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c Mesh.cc -o $@
 
 fem_get_mesh.oct: fem_get_mesh.o
-	$(MKOCTFILE) $(CPPFLAGS) fem_get_mesh.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) fem_get_mesh.o -o $@ $(LIBS)
 
 fem_get_mesh.o: fem_get_mesh.cc
-	$(MKOCTFILE) $(CPPFLAGS) -c fem_get_mesh.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c fem_get_mesh.cc -o $@
 
 DirichletBC.oct: DirichletBC.o
-	$(MKOCTFILE) $(CPPFLAGS) DirichletBC.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) DirichletBC.o -o $@ $(LIBS)
 
 DirichletBC.o: DirichletBC.cc functionspace.h boundarycondition.h expression.h
-	$(MKOCTFILE) $(CPPFLAGS) -c DirichletBC.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c DirichletBC.cc -o $@
 
 Expression.oct: Expression.o
-	$(MKOCTFILE) $(CPPFLAGS) Expression.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) Expression.o -o $@ $(LIBS)
 
 Expression.o: Expression.cc expression.h coefficient.h
-	$(MKOCTFILE) $(CPPFLAGS) -c Expression.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c Expression.cc -o $@
 
 Function.oct: Function.o
-	$(MKOCTFILE) $(CPPFLAGS) Function.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) Function.o -o $@ $(LIBS)
 
 Function.o: Function.cc function.h
-	$(MKOCTFILE) $(CPPFLAGS) -c Function.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c Function.cc -o $@
 
 assemble.oct: assemble.o
-	$(MKOCTFILE) $(CPPFLAGS) assemble.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) assemble.o -o $@ $(LIBS)
 
 assemble.o: assemble.cc form.h boundarycondition.h
-	$(MKOCTFILE) $(CPPFLAGS) -c assemble.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c assemble.cc -o $@
 
 assemble_system.oct: assemble_system.o
-	$(MKOCTFILE) $(CPPFLAGS) assemble_system.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) assemble_system.o -o $@ $(LIBS)
 
 assemble_system.o: assemble_system.cc form.h boundarycondition.h
-	$(MKOCTFILE) $(CPPFLAGS) -c assemble_system.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c assemble_system.cc -o $@
 
 save.oct: save.o mkfunction
-	$(MKOCTFILE) $(CPPFLAGS) save.o -o ./@function/save.oct $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) save.o -o ./@function/save.oct $(LIBS)
 
 save.o: save.cc 
-	$(MKOCTFILE) $(CPPFLAGS) -c save.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c save.cc -o $@
 
 mkfunction:
 	 mkdir -p @function
@@ -84,10 +82,10 @@
 	 mkdir -p @mesh
 
 plot_mesh.oct: plot_mesh.o mkmesh
-	$(MKOCTFILE) $(CPPFLAGS) plot_mesh.o -o ./@mesh/plot.oct $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) plot_mesh.o -o ./@mesh/plot.oct $(LIBS)
 
 plot_mesh.o: plot_mesh.cc Plot_2d.h mesh.h Plot_3d.h
-	$(MKOCTFILE) $(CPPFLAGS) -c plot_mesh.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c plot_mesh.cc -o $@
 
 Plot_2d.h: Plot_2d.ufl
 	$(FFC) -l dolfin Plot_2d.ufl
@@ -96,33 +94,33 @@
 	$(FFC) -l dolfin Plot_3d.ufl
 
 plot_func.oct: plot_func.o mkfunction
-	$(MKOCTFILE) $(CPPFLAGS) plot_func.o -o ./@function/plot.oct $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) plot_func.o -o ./@function/plot.oct $(LIBS)
 
 plot_func.o: plot_func.cc Plot_2d.h mesh.h Plot_3d.h
-	$(MKOCTFILE) $(CPPFLAGS) -c plot_func.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c plot_func.cc -o $@
 
 SubSpace.oct: SubSpace.cc functionspace.h
-	$(MKOCTFILE) $(CPPFLAGS) -I. SubSpace.cc $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -I. SubSpace.cc $(LIBS)
 
 feval.oct: feval.o mkfunction
-	$(MKOCTFILE) $(CPPFLAGS) feval.o -o ./@function/feval.oct $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) feval.o -o ./@function/feval.oct $(LIBS)
 
 feval.o: feval.cc function.h
-	$(MKOCTFILE) $(CPPFLAGS) -c feval.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c feval.cc -o $@
 
 interpolate.oct: interpolate.o
-	$(MKOCTFILE) $(CPPFLAGS) interpolate.o -o $@ $(LDFLAGS) $(LIBS)
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) interpolate.o -o $@ $(LIBS)
 
 interpolate.o: interpolate.cc function.h
-	$(MKOCTFILE) $(CPPFLAGS) -c interpolate.cc $(LDFLAGS) -o $@ -I.
+	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c interpolate.cc -o $@
 
 clean:
-	-rm -f *.o core octave-core *.oct *~ *.xml
+	$(RM) *.o core octave-core *.oct *~ *.xml
 
 cleanall:
-	-rm -f *.o core octave-core *.oct *~ *.xml *.status *.log \
+	$(RM) *.o core octave-core *.oct *~ *.xml *.status *.log \
           octave-workspace configure *.pvd *.vtu
-	-rm -r autom4te.cache
-	-rm -f Makefile
+	$(RM) -r autom4te.cache
+	$(RM) Makefile
 
 
--- a/src/configure.ac	Thu May 29 10:58:17 2014 +0200
+++ b/src/configure.ac	Thu Jun 05 19:50:52 2014 +0200
@@ -21,40 +21,34 @@
 AC_MSG_CHECKING([for eigen3])
 
 EIGEN_CPPFLAGS=
-EIGEN_LDFLAGS=
 EIGEN_LIBS=
 
 PKG_CHECK_EXISTS([eigen3],
-  [EIGEN_CPPFLAGS=`$PKG_CONFIG --cflags-only-I eigen3`
-   EIGEN_LDFLAGS=`$PKG_CONFIG --libs-only-L eigen3`
-   EIGEN_LIBS=`$PKG_CONFIG --libs-only-l eigen3`
+  [EIGEN_CPPFLAGS=`$PKG_CONFIG --cflags eigen3`
+   EIGEN_LIBS=`$PKG_CONFIG --libs eigen3`
    AC_MSG_RESULT([yes])],
   [AC_MSG_RESULT([no])
    AC_MSG_ERROR([eigen3 required to install $PACKAGE_NAME])]
   )
 
 AC_SUBST(EIGEN_CPPFLAGS)
-AC_SUBST(EIGEN_LDFLAGS)
 AC_SUBST(EIGEN_LIBS)
 
 ## Check for dolfin
 AC_MSG_CHECKING([for dolfin])
 
 DOLFIN_CPPFLAGS=
-DOLFIN_LDFLAGS=
 DOLFIN_LIBS=
 
 PKG_CHECK_EXISTS([dolfin],
-  [DOLFIN_CPPFLAGS=`$PKG_CONFIG --cflags-only-I dolfin`
-   DOLFIN_LDFLAGS=`$PKG_CONFIG --libs-only-L dolfin`
-   DOLFIN_LIBS=`$PKG_CONFIG --libs-only-l dolfin`
+  [DOLFIN_CPPFLAGS=`$PKG_CONFIG --cflags dolfin`
+   DOLFIN_LIBS=`$PKG_CONFIG --libs dolfin`
    AC_MSG_RESULT([yes])],
   [AC_MSG_RESULT([no])
    AC_MSG_ERROR([dolfin required to install $PACKAGE_NAME])]
   )
 
 AC_SUBST(DOLFIN_CPPFLAGS)
-AC_SUBST(DOLFIN_LDFLAGS)
 AC_SUBST(DOLFIN_LIBS)