1.1 --- a/Makefile.am	Fri Nov 13 12:33:33 2009 +0100
     1.2 +++ b/Makefile.am	Thu Dec 10 17:05:35 2009 +0100
     1.3 @@ -1,5 +1,7 @@
     1.4  ACLOCAL_AMFLAGS = -I m4
     1.5  
     1.6 +AM_CXXFLAGS = $(WARNINGCXXFLAGS)
     1.7 +
     1.8  AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
     1.9  LDADD = $(top_builddir)/lemon/libemon.la
    1.10  
    1.11 @@ -9,8 +11,12 @@
    1.12  	m4/lx_check_cplex.m4 \
    1.13  	m4/lx_check_glpk.m4 \
    1.14  	m4/lx_check_soplex.m4 \
    1.15 +	m4/lx_check_coin.m4 \
    1.16  	CMakeLists.txt \
    1.17  	cmake/FindGhostscript.cmake \
    1.18 +	cmake/FindCPLEX.cmake \
    1.19 +	cmake/FindGLPK.cmake \
    1.20 +	cmake/FindCOIN.cmake \
    1.21  	cmake/version.cmake.in \
    1.22  	cmake/version.cmake \
    1.23  	cmake/nsis/lemon.ico \
    1.24 @@ -36,9 +42,13 @@
    1.25  include lemon/Makefile.am
    1.26  include test/Makefile.am
    1.27  include doc/Makefile.am
    1.28 -include demo/Makefile.am
    1.29  include tools/Makefile.am
    1.30  
    1.31 +DIST_SUBDIRS = demo
    1.32 +
    1.33 +demo:
    1.34 +	$(MAKE) $(AM_MAKEFLAGS) -C demo
    1.35 +
    1.36  MRPROPERFILES = \
    1.37  	aclocal.m4 \
    1.38  	config.h.in \
    1.39 @@ -65,4 +75,4 @@
    1.40  	zcat $(PACKAGE)-$(VERSION).tar.gz | \
    1.41  	bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
    1.42  
    1.43 -.PHONY: mrproper dist-bz2 distcheck-bz2
    1.44 +.PHONY: demo mrproper dist-bz2 distcheck-bz2