[cig-commits] r12957 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-09-24 04:10:48 -0700 (Wed, 24 Sep 2008)
New Revision: 12957

Modified:
   cs/cigma/trunk/src/Makefile.am
Log:
Update Makefile.am (don't include ANN yet)

Modified: cs/cigma/trunk/src/Makefile.am
===================================================================
--- cs/cigma/trunk/src/Makefile.am	2008-09-24 11:10:46 UTC (rev 12956)
+++ cs/cigma/trunk/src/Makefile.am	2008-09-24 11:10:48 UTC (rev 12957)
@@ -2,10 +2,158 @@
 # -*- Makefile.am -*-														  #
 ###############################################################################
 
-bin_PROGRAMS = hello
+# Main binary
+bin_PROGRAMS = cigma
 
+lib_LTLIBRARIES =
+
+# Shared libraries (internal)
+noinst_LIBRARIES =
+#noinst_LIBRARIES += libann.a
+noinst_LIBRARIES += libcigma.a
+
+
+# Select logging method for trivial logger
+#LOGGER_FLAGS = -DTLOG
+LOGGER_FLAGS = -DETLOG
+#LOGGER_FLAGS = -DFTLOG=cigma
+
+# Include directory for ANN
+ANN_FLAGS = -I$(srcdir)/contrib/ann/include
+
+
 ###############################################################################
+# libann.a library
 
-hello_SOURCES = hello.cpp
+#libann_a_CPPFLAGS = $(ANN_FLAGS)
 
+#libann_a_SOURCES = \
+#	contrib/ann/include/ANN/ANN.h \
+#	contrib/ann/include/ANN/ANNperf.h \
+#	contrib/ann/include/ANN/ANNx.h \
+#	contrib/ann/src/ANN.cpp \
+#	contrib/ann/src/bd_fix_rad_search.cpp \
+#	contrib/ann/src/bd_pr_search.cpp \
+#	contrib/ann/src/bd_search.cpp \
+#	contrib/ann/src/bd_tree.cpp \
+#	contrib/ann/src/bd_tree.h \
+#	contrib/ann/src/brute.cpp \
+#	contrib/ann/src/kd_dump.cpp \
+#	contrib/ann/src/kd_fix_rad_search.cpp \
+#	contrib/ann/src/kd_fix_rad_search.h \
+#	contrib/ann/src/kd_pr_search.cpp \
+#	contrib/ann/src/kd_pr_search.h \
+#	contrib/ann/src/kd_search.cpp \
+#	contrib/ann/src/kd_search.h \
+#	contrib/ann/src/kd_split.cpp \
+#	contrib/ann/src/kd_split.h \
+#	contrib/ann/src/kd_tree.cpp \
+#	contrib/ann/src/kd_tree.h \
+#	contrib/ann/src/kd_util.cpp \
+#	contrib/ann/src/kd_util.h \
+#	contrib/ann/src/perf.cpp \
+#	contrib/ann/src/pr_queue.h \
+#	contrib/ann/src/pr_queue_k.h
+
+
 ###############################################################################
+# libcigma.a library
+
+libcigma_a_CPPFLAGS =
+libcigma_a_CPPFLAGS += -Wno-deprecated
+libcigma_a_CPPFLAGS += $(LOGGER_FLAGS)
+libcigma_a_CPPFLAGS += $(ANN_FLAGS)
+#libcigma_a_CPPFLAGS += $(HDF5_CXXFLAGS)
+#libcigma_a_CPPFLAGS += $(VTK_CXXFLAGS)
+
+libcigma_a_SOURCES = \
+	nullstream.hpp \
+	tri_logger.hpp \
+	tri_logger.cpp \
+	Exception.h \
+	Exception.cpp \
+	Filesystem.h \
+	Filesystem.cpp \
+	Definitions.h \
+	Common.h \
+	Numeric.h \
+	Numeric.cpp \
+	DataPath.h \
+	DataPath.cpp \
+	core_base_op.h \
+	core_base_op.cpp \
+	core_list_op.h \
+	core_list_op.cpp \
+	ProgressTimer.h \
+	ProgressTimer.cpp
+
+
+###############################################################################
+# cigma executable
+
+cigma_CPPFLAGS =
+cigma_CPPFLAGS += -Wno-deprecated
+cigma_CPPFLAGS += $(LOGGER_FLAGS)
+cigma_CPPFLAGS += $(BOOST_CPPFLAGS)
+cigma_CPPFLAGS += $(ANN_FLAGS)
+
+cigma_LDFLAGS =
+cigma_LDFLAGS += $(BOOST_LDFLAGS)
+#cigma_LDFLAGS += $(BOOST_FILESYSTEM_LDFLAGS)
+#cigma_LDFLAGS += $(BOOST_PROGRAM_OPTIONS_LDFLAGS)
+#cigma_LDFLAGS += $(HDF5_LDFLAGS)
+#cigma_LDFLAGS += $(VTK_LDFLAGS)
+
+cigma_LDADD =
+cigma_LDADD += libcigma.a
+#cigma_LDADD += libann.a
+#cigma_LDADD += $(HDF5_LIBS) -lhdf5_cpp		# XXX: fix this flag
+#cigma_LDADD += $(VTK_LIBS)
+#cigma_LDADD += $(BOOST_FILESYSTEM_LIBS)
+#cigma_LDADD += $(BOOST_PROGRAM_OPTIONS_LIBS)
+cigma_LDFLAGS += $(BOOST_FILESYSTEM_LIB)
+cigma_LDFLAGS += $(BOOST_PROGRAM_OPTIONS_LIB)
+
+cigma_SOURCES = \
+	cli_application.h \
+	cli_application.cpp \
+	cli_command.h \
+	cli_command.cpp \
+	cli_skel_cmd.h \
+	cli_skel_cmd.cpp \
+	cli_base_cmd.h \
+	cli_base_cmd.cpp \
+	cli_list_cmd.h \
+	cli_list_cmd.cpp \
+	cigma.cpp
+
+###############################################################################
+# python module
+
+#lib_LTLIBRARIES += libpycigma.la
+
+#libpycigma_la_SOURCES = foo.cpp
+#libpycigma_la_CPPFLAGS = $(libcigma_a_CPPFLAGS) $(PYTHON_INCLUDE_DIR)
+
+#pyexec_PROGRAMS = cigma.so
+
+#clean-local:
+#	rm -rf build
+
+#cigma_so_SOURCES = foo.cpp
+
+#cigma.so: $(cigma_so_SOURCES) $(cigma_so_DEPENDENCIES)
+#	BUILD_DIR=`cd $(top_builddir); pwd`; \
+#	(cd $(srcdir); \
+#	CFLAGS="$(CPPFLAGS) -I$(srcdir) $(libpycigma_la_CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)" \
+#	LDFLAGS="$(LDFLAGS) -L$$BUILD_DIR/.libs" \
+#	ARCHFLAGS="$(ARCHFLAGS)" PYLIBS="$(PYLIBS)" \
+#	$(PYTHON_BIN) python/setup.py build --build-lib=$$BUILD_DIR/ --build-temp=$$BUILD_DIR/build -f)
+
+
+###############################################################################
+# Additional files to include in tarball
+
+EXTRA_DIST =
+
+#EOF