From eb03f78e7d2817ff7a6f9cbeec216b7ff4673519 Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Wed, 20 Jan 2010 20:47:15 +0000
Subject: [PATCH] Removing dependency hack speeds up compilation

---
 CppUnitLite/Makefile |  8 +++++++-
 Makefile.am          |  2 +-
 colamd/Makefile      |  7 ++++++-
 cpp/Makefile.am      | 19 -------------------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/CppUnitLite/Makefile b/CppUnitLite/Makefile
index 2ef78a3bf..83a6f8c52 100644
--- a/CppUnitLite/Makefile
+++ b/CppUnitLite/Makefile
@@ -26,4 +26,10 @@ check:
 
 distdir:
 
-install:
+# Richard: added the following dependencies so that recursive make works:
+
+install: all
+
+distclean: clean
+
+check: all
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 5723d8197..66cedbc8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 # make automake install some standard but missing files
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = cpp wrap
+SUBDIRS = colamd CppUnitLite cpp wrap
 
 # install the matlab toolbox
 install-exec-hook:
diff --git a/colamd/Makefile b/colamd/Makefile
index 927e58405..319373ac9 100755
--- a/colamd/Makefile
+++ b/colamd/Makefile
@@ -33,5 +33,10 @@ check:
 
 distdir:
 
-install:
+# Richard: added the following dependencies so that recursive make works:
 
+install: all
+
+distclean: clean
+
+check: all
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 574c1831b..d968eb1bf 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -26,17 +26,6 @@ current.
 #   then set age to 0.
 version = $(current):$(revision):$(age)
 
-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)
-
-clean_external_libs:
-	@echo Cleaning CppUnitLite...; cd ../CppUnitLite; make clean
-	@echo Cleaning Colamd...; cd ../colamd; make clean
-
 # we specify the library in levels
 
 # basic Math
@@ -285,12 +274,4 @@ CXXLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
 # rule to run an executable
 %.run: % libgtsam.la
 	./$^
-
-# 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)
-
-
-
 	
\ No newline at end of file