rm defunct Nocedal code references (but keep NLOPT_LD_LBFGS_NOCEDAL constant for...

[nlopt.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dc344e976e5c420ec3d04c0ae11d7a2304846de3..c400475c81c1db00e1103bb823146bde6ba75246 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,16 +8,12 @@ CXX_DIRS = stogo
 CXX_LIBS = stogo/libstogo.la
 endif
 
-SUBDIRS = util direct cdirect $(CXX_DIRS) praxis luksan crs mlsl mma cobyla newuoa lbfgs neldermead auglag bobyqa isres slsqp esch api . octave test swig
+SUBDIRS = util direct cdirect $(CXX_DIRS) praxis luksan crs mlsl mma cobyla newuoa neldermead auglag bobyqa isres slsqp esch api . octave test swig
 EXTRA_DIST = autogen.sh nlopt.pc.in m4
 
-if WITH_NOCEDAL
-NOCEDAL_LBFGS=lbfgs/liblbfgs.la
-endif
-
 libnlopt@NLOPT_SUFFIX@_la_SOURCES = 
 libnlopt@NLOPT_SUFFIX@_la_LIBADD = direct/libdirect.la                 \
-cdirect/libcdirect.la $(CXX_LIBS) praxis/libpraxis.la $(NOCEDAL_LBFGS) \
+cdirect/libcdirect.la $(CXX_LIBS) praxis/libpraxis.la \
 luksan/libluksan.la crs/libcrs.la mlsl/libmlsl.la mma/libmma.la                \
 cobyla/libcobyla.la newuoa/libnewuoa.la neldermead/libneldermead.la    \
 auglag/libauglag.la bobyqa/libbobyqa.la isres/libisres.la              \