From 3bf86415172ee588b5bb555b1deaae6dd50f60a1 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Wed, 13 Nov 2013 14:51:31 +0000 Subject: [PATCH] Init all ADOLC variables in one spot [[Imported from SVN: r9534]] --- Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7173245a..fcba8464 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,14 +9,18 @@ SUBDIRS = doc m4 dune test LDADD = $(IPOPT_LDFLAGS) $(IPOPT_LIBS) AM_CPPFLAGS += $(IPOPT_CPPFLAGS) +ADOLC_CPPFLAGS = -I/usr/include +ADOLC_LDFLAGS = -L/usr/lib ADOLC_LIBS = -ladolc noinst_PROGRAMS = cosserat-continuum rodobstacle rod3d harmonicmaps harmonicmaps-eoc rod-eoc cosserat_continuum_SOURCES = cosserat-continuum.cc -cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS) +cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) $(PSURFACE_CPPFLAGS) \ + $(ADOLC_CPPFLAGS} cosserat_continuum_LDADD = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) \ - $(IPOPT_LDFLAGS) $(IPOPT_LIBS) $(PSURFACE_LDFLAGS) $(PSURFACE_LIBS) $(ADOLC_LIBS) + $(IPOPT_LDFLAGS) $(IPOPT_LIBS) $(PSURFACE_LDFLAGS) $(PSURFACE_LIBS) \ + $(ADOLC_LDFLAGS) $(ADOLC_LIBS) rodobstacle_SOURCES = rodobstacle.cc rod3d_SOURCES = rod3d.cc -- GitLab