Changes in Makefile.am [480:64c2641286df:567:3314f58e7b25] in lemon-main

File:

• Makefile.am (modified) (4 diffs)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
+
+AM_CXXFLAGS = $(WARNINGCXXFLAGS)
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@@ -10 +12 @@
         m4/lx_check_glpk.m4 \
         m4/lx_check_soplex.m4 \
+        m4/lx_check_clp.m4 \
+        m4/lx_check_cbc.m4 \
         CMakeLists.txt \
         cmake/FindGhostscript.cmake \
+        cmake/FindGLPK.cmake \
         cmake/version.cmake.in \
         cmake/version.cmake \
@@ -37 +42 @@
 include test/Makefile.am
 include doc/Makefile.am
-include demo/Makefile.am
 include tools/Makefile.am
+
+DIST_SUBDIRS = demo
+
+demo:
+        $(MAKE) $(AM_MAKEFLAGS) -C demo
 
 MRPROPERFILES = \
@@ -66 +75 @@
         bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
-.PHONY: mrproper dist-bz2 distcheck-bz2
+.PHONY: demo mrproper dist-bz2 distcheck-bz2