Changeset 321:a412d990f043 in lemon-main

Timestamp:

10/12/08 20:59:06 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

319:5e12d7734036 (diff), 320:34e185734b42 (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

Files:

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

Makefile.am

@@ -5 +5 @@
 
 EXTRA_DIST = \
+        AUTHORS \
         LICENSE \
         m4/lx_check_cplex.m4 \

Makefile.am

@@ -10 +10 @@
         m4/lx_check_glpk.m4 \
         m4/lx_check_soplex.m4 \
-        CMakeLists.txt
+        CMakeLists.txt \
+        cmake
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -25 +26 @@
 bin_PROGRAMS =
 check_PROGRAMS =
+dist_bin_SCRIPTS =
 TESTS =
 XFAIL_TESTS =
@@ -32 +34 @@
 include doc/Makefile.am
 include demo/Makefile.am
-include benchmark/Makefile.am
 include tools/Makefile.am