diff --git a/gtsam/3rdparty/ccolamd/ChangeLog b/gtsam/3rdparty/ccolamd/ChangeLog index 807135c4d..84f7e44b2 100644 --- a/gtsam/3rdparty/ccolamd/ChangeLog +++ b/gtsam/3rdparty/ccolamd/ChangeLog @@ -6,6 +6,7 @@ June 2, 2011: * Added UFconfig.[c|h] from the UFconfig suitesparse package * Renamed licence file to LGPL.txt - contents remain the same * All code is unchanged from original + * Note: DLONG define removed from build script for compatibility - only necessary to build for long version Original ChangeLog by authors diff --git a/gtsam/3rdparty/ccolamd/Makefile.am b/gtsam/3rdparty/ccolamd/Makefile.am index 7732736f1..4110d5df9 100644 --- a/gtsam/3rdparty/ccolamd/Makefile.am +++ b/gtsam/3rdparty/ccolamd/Makefile.am @@ -7,12 +7,9 @@ # header files are qualified so they can be included in external projects. AUTOMAKE_OPTIONS = nostdinc -headers = -sources = - # CCOLAMD (with UFconfig files included) -headers += ccolamd.h UFconfig.h -sources += ccolamd.c ccolamd_global.c UFconfig.c +headers = ccolamd.h UFconfig.h +sources = ccolamd.c ccolamd_global.c UFconfig.c #---------------------------------------------------------------------------------------------------- # Create a libtool library that is not installed @@ -26,5 +23,5 @@ libccolamd_la_SOURCES = $(sources) AM_CPPFLAGS = -AM_CPPFLAGS += $(BOOST_CPPFLAGS) -I$(top_srcdir) -DDLONG +AM_CPPFLAGS += $(BOOST_CPPFLAGS) -I$(top_srcdir) AM_LDFLAGS = $(BOOST_LDFLAGS)