diff --git a/Makefile.am b/Makefile.am index 109b4540aae2d058751c821861848cd55fca513d..0d0037c7a74eb09cac56683cf85bb097afed57f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,19 +13,10 @@ ADOLC_CPPFLAGS = -I/home/sander/adolc-inst/include ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64 ADOLC_LIBS = -ladolc -noinst_PROGRAMS = cosserat-continuum \ - finite-strain-elasticity \ +noinst_PROGRAMS = finite-strain-elasticity \ mixed-cosserat-continuum \ rodobstacle harmonicmaps harmonicmaps-eoc rod-eoc -cosserat_continuum_SOURCES = cosserat-continuum.cc -cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \ - $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS) -cosserat_continuum_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \ - $(ADOLC_LIBS) $(PYTHON_LIBS) -cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \ - $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS) - finite_strain_elasticity_SOURCES = finite-strain-elasticity.cc finite_strain_elasticity_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \ $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS) $(UMFPACK_CPPFLAGS) diff --git a/src/Makefile.am b/src/Makefile.am index 8725a3568cb0d1cb18c2aad0951beefaebcf195c..f3a7d224cd868e2afab19434149b5c21cc178ed0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,20 @@ SUBDIRS = -noinst_PROGRAMS = rod3d +ADOLC_CPPFLAGS = -I/home/sander/adolc-inst/include +ADOLC_LDFLAGS = -L/home/sander/adolc-inst/lib64 +ADOLC_LIBS = -ladolc + +noinst_PROGRAMS = cosserat-continuum \ + rod3d + +cosserat_continuum_SOURCES = cosserat-continuum.cc +cosserat_continuum_CXXFLAGS = $(UG_CPPFLAGS) $(IPOPT_CPPFLAGS) \ + $(ADOLC_CPPFLAGS) $(PYTHON_CPPFLAGS) +cosserat_continuum_LDADD = $(UG_LIBS) $(IPOPT_LIBS) \ + $(ADOLC_LIBS) $(PYTHON_LIBS) +cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \ + $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS) rod3d_SOURCES = rod3d.cc rod3d_CXXFLAGS = $(IPOPT_CPPFLAGS) diff --git a/cosserat-continuum.cc b/src/cosserat-continuum.cc similarity index 100% rename from cosserat-continuum.cc rename to src/cosserat-continuum.cc