12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing dependency hack speeds up compilation

release/4.3a0
Richard Roberts 2010-01-20 20:47:15 +00:00
parent 588c119bf3
commit eb03f78e7d
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CppUnitLite/Makefile
View File

@ -26,4 +26,10 @@ check:
distdir:
install:
# Richard: added the following dependencies so that recursive make works:
install: all
distclean: clean
check: all

2
Makefile.am
View File

@ -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:

7
colamd/Makefile
View File

@ -33,5 +33,10 @@ check:
distdir:
install:
# Richard: added the following dependencies so that recursive make works:
install: all
distclean: clean
check: all

19
cpp/Makefile.am
View File

@ -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
@ -286,11 +275,3 @@ CXXLINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
%.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)