From 3e4aea01d3cbeefaa2db1d551f07d0e4679e8271 Mon Sep 17 00:00:00 2001 From: John Ellson Date: Thu, 15 Aug 2013 13:22:24 -0400 Subject: [PATCH] have mingle's Makefile.am respect configure's WITH_ANN --- .gitignore | 4 ++-- cmd/mingle/Makefile.am | 2 ++ lib/mingle/Makefile.am | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1769c7117..cffcfc37b 100644 --- a/.gitignore +++ b/.gitignore @@ -69,8 +69,8 @@ cmd/lefty/lefty cmd/lefty/lefty.1.pdf cmd/lneato/lneato cmd/lneato/lneato.1.pdf -cmd/lneato/mingle -cmd/lneato/mingle.1.pdf +cmd/mingle/mingle +cmd/mingle/mingle.1.pdf cmd/smyrna/smyrna cmd/smyrna/smyrna.1.pdf cmd/tools/acyclic diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am index 2ffa7cf8e..4d1c15640 100644 --- a/cmd/mingle/Makefile.am +++ b/cmd/mingle/Makefile.am @@ -12,12 +12,14 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/lib/cgraph \ -I$(top_srcdir)/lib/cdt +if WITH_ANN bin_PROGRAMS = mingle #man_MANS = mingle.1 #pdf_DATA = mingle.1.pdf man_MANS = pdf_DATA = +endif mingle_SOURCES = minglemain.c mingle_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/lib/mingle/Makefile.am b/lib/mingle/Makefile.am index a92a4a57d..d331c446e 100644 --- a/lib/mingle/Makefile.am +++ b/lib/mingle/Makefile.am @@ -13,7 +13,9 @@ AM_CPPFLAGS = \ noinst_HEADERS = edge_bundling.h ink.h agglomerative_bundling.h nearest_neighbor_graph.h nearest_neighbor_graph_ann.h +if WITH_ANN noinst_LTLIBRARIES = libmingle_C.la +endif libmingle_C_la_SOURCES = edge_bundling.c ink.c agglomerative_bundling.c nearest_neighbor_graph.c nearest_neighbor_graph_ann.cpp -- 2.40.0