Removing dependency hack speeds up compilation

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

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:

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

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)
-
-
-