diff --git a/Makefile.am b/Makefile.am index 79d5162ab8238612cfd948cae5546d0c45d144ed..4efaec44c9b9e8b6bda94f4ffa2e16adefab9b57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,7 +43,6 @@ mixed_cosserat_continuum_LDFLAGS = $(UG_LDFLAGS) $(IPOPT_LDFLAGS) \ $(ADOLC_LDFLAGS) $(PYTHON_LDFLAGS) rodobstacle_SOURCES = rodobstacle.cc -rod3d_SOURCES = rod3d.cc rod_eoc_SOURCES = rod-eoc.cc diff --git a/configure.ac b/configure.ac index 4254df6a60de3044ae6622d8e7ff8089d8d7c8f3..fdc37ce41f54a7e96f71c16f519d9d36369a626f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ(2.50) DUNE_AC_INIT AM_INIT_AUTOMAKE -AC_CONFIG_SRCDIR([rod3d.cc]) +AC_CONFIG_SRCDIR([src/rod3d.cc]) AM_CONFIG_HEADER([config.h]) # we need no more than the standard DUNE-stuff diff --git a/src/Makefile.am b/src/Makefile.am index 248bbfd70f83e1ae7e51c349fd1d5c54ba5e3503..8725a3568cb0d1cb18c2aad0951beefaebcf195c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,12 @@ SUBDIRS = -noinst_PROGRAMS = +noinst_PROGRAMS = rod3d + +rod3d_SOURCES = rod3d.cc +rod3d_CXXFLAGS = $(IPOPT_CPPFLAGS) +rod3d_LDADD = $(IPOPT_LIBS) +rod3d_LDFLAGS = $(IPOPT_LDFLAGS) # we need automake 1.5 AUTOMAKE_OPTIONS = foreign 1.5 diff --git a/rod3d.cc b/src/rod3d.cc similarity index 100% rename from rod3d.cc rename to src/rod3d.cc