From b8a55016706c0001fd2b66910585674752a46d46 Mon Sep 17 00:00:00 2001 From: Kai Ni Date: Mon, 24 Aug 2009 21:55:36 +0000 Subject: [PATCH] A much more clean fix for colamd and cppunitlite compilation problem. --- cpp/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 594b34cba..75bd46b33 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -33,12 +33,11 @@ current. # then set age to 0. version = $(current):$(revision):$(age) -all: external_libs - external_libs: @echo Compiling CppUnitLite...; cd ../CppUnitLite; make all @echo Compiling Colamd...; cd ../colamd; make all + clean : clean_external_libs @echo Cleaning Cpp...; rm -f *.o *.lo *.*~ libgtsam.la $(check_PROGRAMS) @@ -160,4 +159,10 @@ TESTS = $(check_PROGRAMS) %.run: % libgtsam.la ./$^ -install-am: external_libs +# to compile colamd and cppunitlite first when make all and make install. +# The part after external_libs is copied from automatically generated Makefile when without the following line +libgtsam.la: external_libs $(libgtsam_la_OBJECTS) $(libgtsam_la_DEPENDENCIES) + $(libgtsam_la_LINK) -rpath $(libdir) $(libgtsam_la_OBJECTS) $(libgtsam_la_LIBADD) $(LIBS) + + +