diff --git a/Makefile.am b/Makefile.am
index 6c644f1c3e049175af479deb7b1d3c160a325953..9f3937a25fc405d6627ba10db0744fe4bc5da85e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,10 @@
 LAPACKPP_CPPFLAGS = -I/home/haile/sander/lapack++-inst/include/lapackpp
 LAPACKPP_LDFLAGS  = -L/home/haile/sander/lapack++-inst/lib -llapackpp
 
+# Include and linker paths to the old fortran IPOpt library
 IPOPT_DIR = /home/haile/sander/COIN/Ipopt
+IPOPT_LDADD    = -L$(IPOPT_DIR)/lib -lipopt -llapack -lblas -lg2c
+IPOPT_CPPFLAGS = -I$(IPOPT_DIR)/IPOPT/include -DHAVE_IPOPT
 
 noinst_PROGRAMS = staticrod staticrod2 rod3d dirneucoupling
 
@@ -17,11 +20,10 @@ staticrod2_SOURCES = staticrod2.cc
 rod3d_SOURCES = rod3d.cc
 
 dirneucoupling_SOURCES  = dirneucoupling.cc
-dirneucoupling_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(MPI_CPPFLAGS) -I$(IPOPT_DIR)/IPOPT/include \
+dirneucoupling_CXXFLAGS = $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS) $(IPOPT_CPPFLAGS) \
                           $(LAPACKPP_CPPFLAGS)
-dirneucoupling_LDADD    = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) $(MPI_LDFLAGS) \
-                          -L$(IPOPT_DIR)/lib -lipopt -llapack -lblas -lg2c \
-                          $(LAPACKPP_LDFLAGS)
+dirneucoupling_LDADD    = $(UG_LDFLAGS) $(AMIRAMESH_LDFLAGS) $(UG_LIBS) $(AMIRAMESH_LIBS) \
+                          $(IPOPT_LDADD) $(LAPACKPP_LDFLAGS)
 
 # don't follow the full GNU-standard
 # we need automake 1.5