Changeset 508:861a9d5ff283 in lemon-1.2 for Makefile.am

Timestamp:

01/23/09 17:42:07 (15 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

509:c5919679af17, 512:9b9ffe7d9b75

Parents:

507:e6ae4999cf22 (diff), 478:64c2641286df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge (manually add cmake/FindGLPK.cmake to Makefile.am)

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.am (modified) (1 diff)

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
+
+AM_CXXFLAGS = $(WARNINGCXXFLAGS)
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
@@ -12 +14 @@
         CMakeLists.txt \
         cmake/FindGhostscript.cmake \
+        cmake/FindGLPK.cmake \
         cmake/version.cmake.in \
         cmake/version.cmake \

Makefile.am

@@ -13 +13 @@
         m4/lx_check_soplex.m4 \
         CMakeLists.txt \
-        cmake
+        cmake/FindGhostscript.cmake \
+        cmake/FindGLPK.cmake \
+        cmake/version.cmake.in \
+        cmake/version.cmake \
+        cmake/nsis/lemon.ico \
+        cmake/nsis/uninstall.ico
 
 pkgconfigdir = $(libdir)/pkgconfig