Merge branch 'master' of https://github.com/stevengj/nlopt

diff --git a/Makefile.am b/Makefile.am
index ad699ee03a285c56788f36ac6466863ea2f1d0ef..182fd844f98a29dd890d652051eb05a0fe4acb34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ CXX_LIBS = stogo/libstogo.la
 endif
 
 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
+EXTRA_DIST = autogen.sh nlopt.pc.in m4 CMakeLists.txt config.cmake.h.in
 
 libnlopt@NLOPT_SUFFIX@_la_SOURCES = 
 libnlopt@NLOPT_SUFFIX@_la_LIBADD = direct/libdirect.la                 \