Moved the subdirectories that compile into libgtsam.la into a 'gtsam' subdirectory. Hopefully a good fix for the problem we had trying to make a gtsam distribution, that the source directory may not be called 'gtsam'.

CppUnitLite/Makefile.am

@@ -8,6 +8,5 @@ sources = Failure.cpp SimpleString.cpp Test.cpp TestRegistry.cpp TestResult.cpp
 headers += $(sources:.cpp=.h)
 
 CppUnitLitedir = $(pkgincludedir)/CppUnitLite
-CppUnitLite_HEADERS = $(headers)
 noinst_LIBRARIES = libCppUnitLite.a
 libCppUnitLite_a_SOURCES = $(sources)

Makefile.am

@@ -11,37 +11,8 @@ ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign nostdinc
 
 # All the sub-directories that need to be built
-SUBDIRS = CppUnitLite base geometry inference linear nonlinear slam . tests wrap examples
-
-# And the corresponding libraries produced
-SUBLIBS = base/libbase.la geometry/libgeometry.la inference/libinference.la \
-          linear/liblinear.la nonlinear/libnonlinear.la slam/libslam.la
-
-# TODO: UFconfig, CCOLAMD, and LDL automake magic without adding or touching any file
-# in those directories as to not invalidate the LGPL license
-# See some possibilities in
-# http://www.gnu.org/software/hello/manual/automake/Third_002dParty-Makefiles.html
-
-# The following lines specify the actual shared library to be built with libtool
-lib_LTLIBRARIES = libgtsam.la
-libgtsam_la_SOURCES = 
-nodist_EXTRA_libgtsam_la_SOURCES = dummy.cxx
-libgtsam_la_LIBADD = $(SUBLIBS) -L$(CCOLAMDLib) $(BOOST_LDFLAGS) -lccolamd
-libgtsam_la_LDFLAGS = -no-undefined -version-info 0:0:0
-
-if USE_ACCELERATE_MACOS
-libgtsam_la_LDFLAGS += -Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate
-endif
+SUBDIRS = CppUnitLite gtsam tests examples
 
 # Add these files to make sure they're in the distribution
-noinst_HEADERS = gtsam.h
 EXTRA_DIST = autogen.sh configure.ac THANKS 
 
-# Todo: Also do CppUnitLite with automake 
-dist-hook:
-	mkdir $(distdir)/config
-	mkdir $(distdir)/matlab
-	cp -p $(srcdir)/matlab/*.m $(distdir)/matlab
-	cp -r $(srcdir)/wrap/expected $(distdir)/wrap
-
-

configure.ac

@@ -4,18 +4,16 @@
 AC_PREREQ(2.59)
 AC_INIT(gtsam, 0.9.0, dellaert@cc.gatech.edu)
 AM_INIT_AUTOMAKE(gtsam, 0.9.0)
-AC_OUTPUT(Makefile CppUnitLite/Makefile base/Makefile inference/Makefile linear/Makefile geometry/Makefile nonlinear/Makefile slam/Makefile tests/Makefile wrap/Makefile examples/Makefile examples/vSLAMexample/Makefile)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([CppUnitLite/Test.cpp])
-AC_CONFIG_SRCDIR([base/DSFVector.cpp])
-AC_CONFIG_SRCDIR([geometry/Cal3_S2.cpp])
-AC_CONFIG_SRCDIR([inference/SymbolicFactorGraph.cpp])
-AC_CONFIG_SRCDIR([linear/GaussianFactor.cpp])
-AC_CONFIG_SRCDIR([nonlinear/NonlinearOptimizer.cpp])
-AC_CONFIG_SRCDIR([slam/pose2SLAM.cpp])
+AC_CONFIG_SRCDIR([gtsam/base/DSFVector.cpp])
+AC_CONFIG_SRCDIR([gtsam/geometry/Cal3_S2.cpp])
+AC_CONFIG_SRCDIR([gtsam/inference/SymbolicFactorGraph.cpp])
+AC_CONFIG_SRCDIR([gtsam/linear/GaussianFactor.cpp])
+AC_CONFIG_SRCDIR([gtsam/nonlinear/NonlinearOptimizer.cpp])
+AC_CONFIG_SRCDIR([gtsam/slam/pose2SLAM.cpp])
 AC_CONFIG_SRCDIR([tests/testSQP.cpp])
-AC_CONFIG_SRCDIR([wrap/wrap.cpp])
 AC_CONFIG_SRCDIR([examples/SimpleRotation.cpp])
 
 # Check for OS
@@ -169,4 +167,13 @@ AC_ARG_WITH([ccolamd-lib],
             [CCOLAMDLib=${HOME}/lib])
 AC_SUBST([CCOLAMDLib])
 
+# For now we require blas, atlas, and lapack
+#AM_COND_IF([test x$ISMAC = xtrue],
+#    [LINALG_CPPFLAGS="-I/System/Library/Frameworks/vecLib.framework/Headers ${CCOLAMDInc} -DGT_USE_LAPACK"],
+#    [LINALG_CPPFLAGS="${CCOLAMDInc} -DGT_USE_LAPACK"])
+#AM_COND_IF([test x$ISMAC = xtrue],
+#    [LINALG_LDFLAGS="-Wl,/System/Library/Frameworks/Accelerate.framework/Accelerate ${CCOLAMDLib}"],
+#    [LINALG_LDFLAGS="-lcblas -latlas -llapack ${CCOLAMDLib}"])
+
+AC_CONFIG_FILES([CppUnitLite/Makefile gtsam/base/Makefile gtsam/geometry/Makefile gtsam/inference/Makefile gtsam/linear/Makefile gtsam/nonlinear/Makefile gtsam/slam/Makefile gtsam/Makefile tests/Makefile examples/Makefile Makefile])
 AC_OUTPUT

examples/Makefile.am

@@ -22,9 +22,9 @@ noinst_PROGRAMS += Pose2SLAMwSPCG_advanced  		# Solves a simple Pose2 SLAM examp
 #----------------------------------------------------------------------------------------------------
 # rules to build local programs
 #----------------------------------------------------------------------------------------------------
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
-LDADD = ../libgtsam.la
+LDADD = ../gtsam/libgtsam.la
 AM_DEFAULT_SOURCE_EXT = .cpp
 
 # rule to run an executable

examples/vSLAMexample/Makefile.am

@@ -23,7 +23,7 @@ vISAMexample_SOURCES = vISAMexample.cpp Feature2D.cpp vSLAMutils.cpp
 #----------------------------------------------------------------------------------------------------
 AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
 AM_LDFLAGS = $(BOOST_LDFLAGS)
-LDADD = ../../libgtsam.la
+LDADD = ../../gtsam/libgtsam.la
 AM_DEFAULT_SOURCE_EXT = .cpp
 
 

gtsam/base/Makefile.am

@@ -50,7 +50,7 @@ base_HEADERS = $(headers)
 noinst_LTLIBRARIES = libbase.la
 libbase_la_SOURCES = $(sources)
 
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(CCOLAMDInc) -I$(top_srcdir)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 if USE_BLAS
@@ -68,7 +68,7 @@ endif
 TESTS = $(check_PROGRAMS)
 AM_DEFAULT_SOURCE_EXT = .cpp
 AM_LDFLAGS += $(boost_serialization) -L$(CCOLAMDLib) -lccolamd
-LDADD = libbase.la ../CppUnitLite/libCppUnitLite.a
+LDADD = libbase.la ../../CppUnitLite/libCppUnitLite.a
 
 if USE_BLAS_LINUX
 AM_LDFLAGS += -lcblas -latlas  

gtsam/base/tests/testBTree.cpp

@@ -22,7 +22,7 @@
 #include <boost/assign/std/list.hpp> // for +=
 using namespace boost::assign;
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/BTree.h>
 
 using namespace std;

gtsam/base/tests/testDSF.cpp

@@ -21,7 +21,7 @@
 #include <boost/assign/std/list.hpp>
 #include <boost/assign/std/set.hpp>
 using namespace boost::assign;
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/base/DSF.h>
 

gtsam/base/tests/testDSFVector.cpp

@@ -21,7 +21,7 @@
 #include <boost/assign/std/list.hpp>
 #include <boost/assign/std/set.hpp>
 using namespace boost::assign;
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/base/DSFVector.h>
 

gtsam/base/tests/testDenseQRUtil.cpp

@@ -16,7 +16,7 @@
  **/
 
 #include <iostream>
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/DenseQRUtil.h>
 
 using namespace std;

gtsam/base/tests/testFixedVector.cpp

@@ -14,7 +14,7 @@
  * @author Alex Cunningham
  */
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/base/FixedVector.h>
 

gtsam/base/tests/testLieScalar.cpp

@@ -14,7 +14,7 @@
  * @author Kai Ni
  */
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/base/LieScalar.h>
 

gtsam/base/tests/testLieVector.cpp

@@ -14,7 +14,7 @@
  * @author Alex Cunningham
  */
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/base/LieVector.h>
 

gtsam/base/tests/testMatrix.cpp

@@ -17,7 +17,7 @@
  **/
 
 #include <iostream>
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <boost/tuple/tuple.hpp>
 #include <boost/foreach.hpp>
 #include <boost/numeric/ublas/matrix_proxy.hpp>

gtsam/base/tests/testVector.cpp

@@ -16,7 +16,7 @@
  **/
 
 #include <iostream>
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <boost/tuple/tuple.hpp>
 #include <gtsam/base/Vector.h>
 

gtsam/geometry/Makefile.am

@@ -41,7 +41,7 @@ geometrydir = $(pkgincludedir)/geometry
 geometry_HEADERS = $(headers)
 noinst_LTLIBRARIES = libgeometry.la
 libgeometry_la_SOURCES = $(sources)
-AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)/..
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(top_srcdir)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 #----------------------------------------------------------------------------------------------------
@@ -49,7 +49,7 @@ AM_LDFLAGS = $(BOOST_LDFLAGS)
 #----------------------------------------------------------------------------------------------------
 TESTS = $(check_PROGRAMS)
 AM_LDFLAGS += $(boost_serialization) 
-LDADD = libgeometry.la ../base/libbase.la ../CppUnitLite/libCppUnitLite.a
+LDADD = libgeometry.la ../base/libbase.la ../../CppUnitLite/libCppUnitLite.a
 AM_DEFAULT_SOURCE_EXT = .cpp
 
 if USE_ACCELERATE_MACOS

gtsam/geometry/tests/testCal3_S2.cpp

@@ -14,7 +14,7 @@
  * @brief Unit tests for transform derivatives
  */
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/Cal3_S2.h>
 

gtsam/geometry/tests/testCalibratedCamera.cpp

@@ -17,7 +17,7 @@
 
 #include <iostream>
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/CalibratedCamera.h>
 

gtsam/geometry/tests/testFundamental.cpp

@@ -21,7 +21,7 @@
 #include <boost/assign/std/list.hpp> // for operator +=
 using namespace boost::assign;
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/geometry/tensors.h>
 #include <gtsam/geometry/tensorInterface.h>

gtsam/geometry/tests/testHomography2.cpp

@@ -21,7 +21,7 @@
 #include <boost/assign/std/list.hpp> // for operator +=
 using namespace boost::assign;
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/base/Testable.h>
 #include <gtsam/geometry/tensors.h>

gtsam/geometry/tests/testPoint2.cpp

@@ -15,7 +15,7 @@
  * @author Frank Dellaert
  **/
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/geometry/Point2.h>
 
 using namespace std;

gtsam/geometry/tests/testPoint3.cpp

@@ -14,7 +14,7 @@
  * @brief  Unit tests for Point3 class
  */   
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/geometry/Point3.h>
 
 using namespace gtsam;

gtsam/geometry/tests/testPose2.cpp

@@ -22,7 +22,7 @@
 #include <boost/assign/std/vector.hpp> // for operator +=
 using namespace boost::assign;
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/lieProxies.h>
 #include <gtsam/geometry/Pose2.h>

gtsam/geometry/tests/testPose3.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <math.h>
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/lieProxies.h>
 #include <gtsam/geometry/Pose3.h>

gtsam/geometry/tests/testRot2.cpp

@@ -15,7 +15,7 @@
  * @author  Frank Dellaert
  */
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/Rot2.h>
 

gtsam/geometry/tests/testRot3.cpp

@@ -15,7 +15,7 @@
  * @author  Alireza Fathi
  */
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <boost/math/constants/constants.hpp>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/lieProxies.h>

gtsam/geometry/tests/testSimpleCamera.cpp

@@ -18,7 +18,7 @@
 #include <math.h>
 #include <iostream>
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/SimpleCamera.h>
 

gtsam/geometry/tests/testStereoCamera.cpp

@@ -16,7 +16,7 @@
  * @author  Chris Beall
  */
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/StereoCamera.h>
 

gtsam/geometry/tests/testTensors.cpp

@@ -21,7 +21,7 @@
 #include <boost/assign/std/list.hpp> // for operator +=
 using namespace boost::assign;
 
-#include <gtsam/CppUnitLite/TestHarness.h>
+#include <CppUnitLite/TestHarness.h>
 
 #include <gtsam/geometry/tensors.h>
 #include <gtsam/geometry/tensorInterface.h>