[mathic] 07/62: Fixed Makefile.am so that all the headers get installed and fixed src/mathic.h so that it includes the other headers at the correct path.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository mathic.

commit d802b2e91534de3aa190b13045a67ce2f8d4ebd3
Author: Bjarke Hammersholt Roune <bjarkehr.code at gmail.com>
Date:   Mon Jul 9 00:45:24 2012 -0400

    Fixed Makefile.am so that all the headers get installed and fixed src/mathic.h so that it includes the other headers at the correct path.
---
 Makefile.am  | 33 ++++++++++++---------------------
 src/mathic.h | 36 ++++++++++++++++++------------------
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 02a1be7..0787885 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,7 @@ AM_CXXFLAGS=-I$(top_srcdir)/src/
 # libraries that are needed by this library
 libmathic_ at MATHIC_API_VERSION@_la_LIBADD= $(DEPS_LIBS)
 
-# the sources that are built to make libmathic. Listing the headers in
-# sources ensure that those files are included in distributions.
+# the sources that are built to make libmathic.
 libmathic_ at MATHIC_API_VERSION@_la_SOURCES = src/mathic/Timer.cpp		\
   src/mathic/ColumnPrinter.cpp src/mathic/DivMask.cpp					\
   src/mathic/Action.cpp src/mathic/BoolParameter.cpp					\
@@ -27,7 +26,17 @@ libmathic_ at MATHIC_API_VERSION@_la_SOURCES = src/mathic/Timer.cpp		\
   src/mathic/ElementDeleter.cpp src/mathic/NameFactory.cpp				\
   src/mathic/error.cpp src/mathic/HelpAction.cpp						\
   src/mathic/IntegerParameter.cpp src/mathic/StringParameter.cpp		\
-  src/mathic/display.cpp src/mathic/Action.h src/mathic/Geobucket.h		\
+  src/mathic/display.cpp
+
+# The headers that libmathic installs.
+# Normally, automake strips the path from the files when installing them,
+# so src/mathic/x.h gets installed as just x.h.
+mathicA_include_HEADERS = src/mathic.h
+mathicA_includedir = $(includedir)/mathic-$(MATHIC_API_VERSION)
+# install remaining headers into subdirectory of the include dir
+mathicB_includedir = \
+  $(includedir)/mathic-$(MATHIC_API_VERSION)/mathic
+mathicB_include_HEADERS = src/mathic/Action.h src/mathic/Geobucket.h	\
   src/mathic/BinaryKDTree.h src/mathic/GeoFront.h						\
   src/mathic/BoolParameter.h src/mathic/Heap.h							\
   src/mathic/CliParameter.h src/mathic/HelpAction.h						\
@@ -40,24 +49,6 @@ libmathic_ at MATHIC_API_VERSION@_la_SOURCES = src/mathic/Timer.cpp		\
   src/mathic/StringParameter.h src/mathic/ElementDeleter.h				\
   src/mathic/Timer.h src/mathic/error.h src/mathic/TourTree.h
 
-# The headers that libmathic installs.
-# Normally, automake strips the path from the files when installing them,
-# so src/mathic/x.h gets installed as just x.h.
-mathicA_include_HEADERS = src/mathic.h
-mathicA_includedir = $(includedir)/mathic-$(MATHIC_API_VERSION)
-# install remaining headers into subdirectory of the include dir
-mathicB_includedir = \
-  $(includedir)/mathic-$(MATHIC_API_VERSION)/mathic
-mathicB_include_HEADERS = src/mathic/stdinc.h src/mathic/Timer.h	\
-  src/mathic/ColumnPrinter.h src/mathic/ElementDeleter.h			\
-  src/mathic/error.h src/mathic/DivList.h src/mathic/KDTree.h		\
-  src/mathic/TourTree.h src/mathic/StlSet.h src/mathic/Heap.h		\
-  src/mathic/Geobucket.h src/mathic/Action.h src/mathic/DivMask.h	\
-  src/mathic/BoolParameter.h src/mathic/CliParameter.h				\
-  src/mathic/CliParser.h src/mathic/HelpAction.h					\
-  src/mathic/IntegerParameter.h src/mathic/StringParameter.h		\
-  src/mathic/display.h src/mathic/NameFactory.h
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = build/autotools/mathic-$(MATHIC_API_VERSION).pc
 
diff --git a/src/mathic.h b/src/mathic.h
index 4d46862..d9ffb91 100755
--- a/src/mathic.h
+++ b/src/mathic.h
@@ -1,27 +1,27 @@
 // Include this file to pull in all external MemTailor files
 
 // utilities
-#include "../../src/Timer.h"
-#include "../../src/ColumnPrinter.h"
-#include "../../src/ElementDeleter.h"
-#include "../../src/error.h"
+#include "mathic/Timer.h"
+#include "mathic/ColumnPrinter.h"
+#include "mathic/ElementDeleter.h"
+#include "mathic/error.h"
 
 // divisor query data structures
-#include "../../src/DivList.h"
-#include "../../src/KDTree.h"
+#include "mathic/DivList.h"
+#include "mathic/KDTree.h"
 
 // priority queue data structures
-#include "../../src/TourTree.h"
-#include "../../src/StlSet.h"
-#include "../../src/Heap.h"
-#include "../../src/Geobucket.h"
+#include "mathic/TourTree.h"
+#include "mathic/StlSet.h"
+#include "mathic/Heap.h"
+#include "mathic/Geobucket.h"
 
 // CLI package
-#include "../../src/Action.h"
-#include "../../src/BoolParameter.h"
-#include "../../src/CliParameter.h"
-#include "../../src/CliParser.h"
-#include "../../src/HelpAction.h"
-#include "../../src/IntegerParameter.h"
-#include "../../src/StringParameter.h"
-#include "../../src/display.h"
+#include "mathic/Action.h"
+#include "mathic/BoolParameter.h"
+#include "mathic/CliParameter.h"
+#include "mathic/CliParser.h"
+#include "mathic/HelpAction.h"
+#include "mathic/IntegerParameter.h"
+#include "mathic/StringParameter.h"
+#include "mathic/display.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathic.git