Changes in Makefile.am [375:a637fb9d457b:799:71f9c1f0d808] in lemon

File:

• Makefile.am (modified) (3 diffs)

Makefile.am

@@ -12 +12 @@
         m4/lx_check_glpk.m4 \
         m4/lx_check_soplex.m4 \
+        m4/lx_check_coin.m4 \
         CMakeLists.txt \
-        cmake
+        cmake/FindGhostscript.cmake \
+        cmake/FindCPLEX.cmake \
+        cmake/FindGLPK.cmake \
+        cmake/FindCOIN.cmake \
+        cmake/LEMONConfig.cmake.in \
+        cmake/version.cmake.in \
+        cmake/version.cmake \
+        cmake/nsis/lemon.ico \
+        cmake/nsis/uninstall.ico
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -35 +44 @@
 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 = \
@@ -64 +77 @@
         bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
-.PHONY: mrproper dist-bz2 distcheck-bz2
+.PHONY: demo mrproper dist-bz2 distcheck-bz2