Another restructuring: moved include/*.h -> include/GiNaC/*.h in order to

allow compiling against GiNaC without having to make install first.

diff --git a/Makefile.in b/Makefile.in
index b7db7d07256d9665b3170d07345c8188b72c4c31..bcf90630266e21fb135fec79b0a2f761878a668d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,7 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
 
-all:   lib ginsh
+all:   lib ginsh/ginsh
        echo "now type make install"
 
 src/libginac.la:
@@ -41,9 +41,15 @@ lib:
        cd src; ${MAKE} all
 
 
-# Target for making the GiNaC interactive shell (ginsh):
-ginsh:
-       if [ "${shared}" ]; then ${MAKE} sharedginsh; else ${MAKE} staticginsh; fi
+# Targets for making the GiNaC interactive shell (ginsh)
+ginsh: ginsh/ginsh
+
+ginsh/ginsh:
+       if [ "${shared}" ]; then \
+               ${MAKE} sharedginsh; \
+       else \
+               ${MAKE} staticginsh; \
+       fi
 
 sharedginsh: src/libginac.la
        cd ginsh; ${MAKE} sharedginsh
@@ -54,7 +60,11 @@ staticginsh: src/.libs/libginac.a
 
 # Target for running a test-suite across the library:
 check:
-       if [ "${shared}" ]; then ${MAKE} sharedcheck; else ${MAKE} staticcheck; fi
+       if [ "${shared}" ]; then \
+               ${MAKE} sharedcheck; \
+       else \
+               ${MAKE} staticcheck; \
+       fi
 
 sharedcheck: src/libginac.la
        cd check; ${MAKE} sharedcheck
@@ -66,22 +76,21 @@ staticcheck: src/.libs/libginac.a
 # Targets for installation in install directories.  The user-visible target
 # `install' determines which one to call (static lib only or both shared and
 # static lib).
-install:
+install: installdirs
        @ if [ "${shared}" ]; then \
-               ${MAKE} shlibinst; \
+               ${MAKE} sharedinst; \
        else \
-               ${MAKE} libinst; \
+               ${MAKE} staticinst; \
        fi
-       ${INSTALL} -d ${includedir}
-       ${INSTALL_DATA} include/*.h ${includedir}/
+       ${INSTALL_DATA} include/GiNaC/*.h ${includedir}/
        cd ginsh; ${MAKE} install
        cd doc; ${MAKE} install
 
-shlibinst: src/libginac.la installdirs
+sharedinst: src/libginac.la
        ${LIBTOOL} install src/libginac.la ${libdir}/libginac.la
        ${LIBTOOL} -n --finish ${libdir}
 
-libinst: src/.libs/libginac.a installdirs
+staticinst: src/.libs/libginac.a
        ${INSTALL_DATA} src/.libs/libginac.a ${libdir}/libginac.a
 
 installdirs:

diff --git a/check/Makefile.in b/check/Makefile.in
index 6572b14bb15ea8eeb0268b4cb80d351c8a3e21b0..be0c41006602b49325b824df3d2a7923521d7588 100644 (file)
--- a/check/Makefile.in
+++ b/check/Makefile.in
@@ -26,7 +26,7 @@ OBJECTS = paranoia_check.o numeric_output.o numeric_consist.o powerlaws.o \
 all: 
        echo "Please call it with 'make check' from top-level Makefile."
        echo "Alternatively, you can use this Makefile's targets {shared|static}check"
-       echo "depending on your personal preferences and which lib you built."
+       echo "depending on your personal preferences and which library you built."
 
 sharedcheck: ${OBJECTS} ../src/.libs/libginac.so
        ${CXX} ${LDFLAGS} ${OBJECTS} -Wl,--rpath -Wl,../src/.libs -L../src/.libs -lginac ${LIBS} -o main

diff --git a/check/differentiation.cpp b/check/differentiation.cpp
index e917bd79ce100aab27d7c59c572f563a5cf48999..6537eb3f7eb9eb1dfbfba0d4b95e2e0c9ec2d977 100644 (file)
--- a/check/differentiation.cpp
+++ b/check/differentiation.cpp
@@ -2,7 +2,7 @@
 
 /* Tests for symbolic differentiation, including various functions. */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 static unsigned check_diff(const ex &e, const symbol &x,
                            const ex &d, unsigned nth=1)

diff --git a/check/expand_subs.cpp b/check/expand_subs.cpp
index 083eae5470ae34a08a6d877836f1e7e1cc2a9de7..e29e1777515174291848a49196e081ed36c570a2 100644 (file)
--- a/check/expand_subs.cpp
+++ b/check/expand_subs.cpp
@@ -12,7 +12,7 @@
  *     substitute a0 by -a1 in e
  * after which e should return 0 (without expanding). */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 #define VECSIZE 100
 

diff --git a/check/inifcns_consist.cpp b/check/inifcns_consist.cpp
index 35baf29c078eb25750a31b2721bf1f17e3dc1b89..8eaf15fca778aacdc72f691b6001783946044821 100644 (file)
--- a/check/inifcns_consist.cpp
+++ b/check/inifcns_consist.cpp
@@ -3,7 +3,7 @@
 /* This test routine applies assorted tests on initially known higher level
  * functions. */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 /* Simple tests on the sine trigonometric function. */
 static unsigned inifcns_consist_sin(void)

diff --git a/check/lsolve_onedim.cpp b/check/lsolve_onedim.cpp
index d89722f2a612206450130349a3bba1c56a95aec8..f2dc8c066ee9645da6d938dbceb4d670bef04b3d 100644 (file)
--- a/check/lsolve_onedim.cpp
+++ b/check/lsolve_onedim.cpp
@@ -3,7 +3,7 @@
 /* This test routine does some simple checks on solving a polynomial for a
  * variable. */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 unsigned lsolve_onedim(void)
 {

diff --git a/check/main.cpp b/check/main.cpp
index 1440777a82957f03d879d034ac9536e93d842f28..787f92080eae1875c79c0c556d339110ac1bb900 100644 (file)
--- a/check/main.cpp
+++ b/check/main.cpp
@@ -1,6 +1,7 @@
 // check/main.cpp
 
-#include "ginac.h"
+#include <stdexcept>
+#include <GiNaC/ginac.h>
 #include "check.h"
 
 int main()

diff --git a/check/matrix_checks.cpp b/check/matrix_checks.cpp
index 1bf8e0c85019c5e94a242bff95bf0383c5dbfe1a..4be5af73ef5df5b9058237af7c03aad63318ffcc 100644 (file)
--- a/check/matrix_checks.cpp
+++ b/check/matrix_checks.cpp
@@ -2,8 +2,8 @@
 
 /* Here we test manipulations on GiNaC's symbolic matrices. */
 
-#include "ginac.h"
 #include <stdexcept>
+#include <GiNaC/ginac.h>
 
 static unsigned matrix_determinants(void)
 {

diff --git a/check/normalization.cpp b/check/normalization.cpp
index 83befd8589a8167958ef99aa3f505783ab329e56..89809c1a88715912132e2c83493fe89f77122be3 100644 (file)
--- a/check/normalization.cpp
+++ b/check/normalization.cpp
@@ -2,7 +2,7 @@
 
 /* Rational function normalization test-suite. */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 static symbol x("x"), y("y"), z("z");
 

diff --git a/check/numeric_consist.cpp b/check/numeric_consist.cpp
index d7a5b6b8ed96817a11617b7a2682f891d08eacc8..9f5582951b2bf0ff97ebb95af30e7c2f95ce9de2 100644 (file)
--- a/check/numeric_consist.cpp
+++ b/check/numeric_consist.cpp
@@ -3,8 +3,8 @@
 /* This test routine creates some numbers and check the result of several
  * boolean tests on these numbers like is_integer() etc... */
 
-#include "ginac.h"
 #include <stdlib.h>
+#include <GiNaC/ginac.h>
 
 /* Simple and maybe somewhat pointless consistency tests of assorted tests and
  * conversions. */

diff --git a/check/numeric_output.cpp b/check/numeric_output.cpp
index f010ab79dc4b5e558757577a80ff70e8100fc84c..f35663ea217ba6efda9941e4547c8bcfd2078d7d 100644 (file)
--- a/check/numeric_output.cpp
+++ b/check/numeric_output.cpp
@@ -1,6 +1,6 @@
 // check/numeric_output.cpp
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 unsigned numeric_output(void)
 {

diff --git a/check/paranoia_check.cpp b/check/paranoia_check.cpp
index bc66deaf63db4736a8f4f64156c41d3a45efde50..6504bd856b9c564deb1ba51797700bf0801a4bc8 100644 (file)
--- a/check/paranoia_check.cpp
+++ b/check/paranoia_check.cpp
@@ -5,7 +5,7 @@
  * a sick behaviour again.  But since we are paranoic and we want to exclude
  * that behaviour for good... */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 // The very first pair of historic problems had its roots in power.cpp and was
 // finally resolved on April 27th. (Fixing the first on April 23rd actually

diff --git a/check/poly_gcd.cpp b/check/poly_gcd.cpp
index 6f81f6aaa1fe21752be063b88710fc041254fd96..ee8b63d47f2e7854aefcf85c4d14f20be83be671 100644 (file)
--- a/check/poly_gcd.cpp
+++ b/check/poly_gcd.cpp
@@ -3,7 +3,7 @@
 /* Some test with polynomial GCD calculations. See also the checks for
  * rational function normalization in normalization.cpp. */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 const int MAX_VARIABLES = 5;
 

diff --git a/check/powerlaws.cpp b/check/powerlaws.cpp
index 9177dd709a0994fc2d263d18fa57883167322683..3dc867dfb84830659af53738c681c3c81f33d3b2 100644 (file)
--- a/check/powerlaws.cpp
+++ b/check/powerlaws.cpp
@@ -3,7 +3,7 @@
 /* Tests for power laws.  You shouldn't try to draw much inspiration from
  * this code, it is a sanity check rather deeply rooted in GiNaC's classes. */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 static unsigned powerlaws1(void)
 {

diff --git a/check/series_expansion.cpp b/check/series_expansion.cpp
index ceb9016a849c7f7a39cf814c7eb0f1673090420b..b5cc110cf8d0227d7b3e88594525dbc8e2e9c78c 100644 (file)
--- a/check/series_expansion.cpp
+++ b/check/series_expansion.cpp
@@ -2,7 +2,7 @@
 
 /* Series expansion test (Laurent and Taylor series). */
 
-#include "ginac.h"
+#include <GiNaC/ginac.h>
 
 static symbol x("x");
 

diff --git a/configure b/configure
index 2424819a9e36fef56b36e9d97e69efe28ccaf7e1..4f04a4caa8f9b1bc87b41a713ae374d39ce635f4 100755 (executable)
--- a/configure
+++ b/configure
@@ -454,7 +454,7 @@ echo > confdefs.h
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=include/ginac.h
+ac_unique_file=include/GiNaC/ginac.h
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
@@ -528,7 +528,7 @@ fi
 
 GiNaC_Major_Version=0
 GiNaC_Minor_Version=0
-GiNaC_Micro_Version=30
+GiNaC_Micro_Version=40
 GiNaC_Version="${GiNaC_Major_Version}.${GiNaC_Minor_Version}.${GiNaC_Micro_Version}"
 LibGiNaC_Ver="${GiNaC_Major_Version}:${GiNaC_Micro_Version}:${GiNaC_Minor_Version}"
 

diff --git a/configure.in b/configure.in
index d4b6d12a5e96ab3cf838ab8f3ce4bd21b407ab59..069bb7279c9f9cf8ca5e6a17a3d545b44b60d9b2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ dnl See aclocal.m4 for additional self-made macros.
 dnl ===========================================================================
 
 dnl This file is used as a signal that everything is in place:
-AC_INIT(include/ginac.h)
+AC_INIT(include/GiNaC/ginac.h)
 dnl A convenient header file for some additional system-dependend output:
 AC_CONFIG_HEADER(config.h)
 

diff --git a/doc/Makefile b/doc/Makefile
index d731fae6976c419a1ace95697e054ec48a64e8a2..66acd0f589c346e782722028a6037b1504c5807d 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,7 +5,7 @@
 
 # Substitution variables from configure skript:
 # Here come the usual install directories in GNU-configure fashion:
-prefix = /tmp
+prefix = /usr/local
 docdir = ${prefix}/share/doc/GiNaC
 srcdir = .
 # Dimitri van Heesch's Doxygen is needed for developer's resource:

diff --git a/ginsh/Makefile.in b/ginsh/Makefile.in
index 1fcdda4cd25c39ada5faa9a3dd17c4a7eeab427c..fefd5d5ab487d434e3e6df5710496fb4f5cde8c7 100644 (file)
--- a/ginsh/Makefile.in
+++ b/ginsh/Makefile.in
@@ -4,7 +4,7 @@
 # values from configure which checks it anyways:
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
-CPPFLAGS = @CPPFLAGS@ -I../ -I../include
+CPPFLAGS = @CPPFLAGS@ -I.. -I../include
 DEFS = @DEFS@
 LIBS = @LIBS@ @LEXLIB@
 LDFLAGS = @LDFLAGS@
@@ -30,8 +30,8 @@ OBJECTS=y.tab.o @LEX_OUTPUT_ROOT@.o
 
 all:   
        echo "Please call it with 'make ginsh' from top-level Makefile."
-       echo "Alternatively, you can use this Makefile's targets {shared|static} ginsh"
-       echo "depending on your personal preferences and which lib you built."
+       echo "Alternatively, you can use this Makefile's targets {shared|static}ginsh"
+       echo "depending on your personal preferences and which library you built."
 
 sharedginsh: depend ${OBJECTS}
        ${CXX} ${CXXFLAGS} ${LDFLAGS} ${OBJECTS} ${LIBS} -Wl,--rpath -Wl,../src/.libs -L../src/.libs -lginac -o ginsh
@@ -72,6 +72,7 @@ depend:
 # Special dummy targets:
 .PHONY: clean distclean depend all install uninstall check doc
 .SUFFIXES: .o .c .h .y .l
+.SILENT: all
 
 # Suffix rules:
 .c.o :

diff --git a/ginsh/ginsh.l b/ginsh/ginsh.l
index f46f9490e37df0e6521e3a54aafce5e9e869d1d5..6f4fb212a92806e36adfdf1f2ab6145763f05dc3 100644 (file)
--- a/ginsh/ginsh.l
+++ b/ginsh/ginsh.l
@@ -22,7 +22,7 @@ extern "C" {
 }
 #include <map>
 
-#include <ginac.h>
+#include <GiNaC/ginac.h>
 
 #include "ginsh.h"
 #include "y.tab.h"

diff --git a/ginsh/ginsh.y b/ginsh/ginsh.y
index 143eae5615d716400b89cf4ee5e6d1476fbd998e..e0d1de843e66d934b3d83e4455b5a38d8f8b895f 100644 (file)
--- a/ginsh/ginsh.y
+++ b/ginsh/ginsh.y
@@ -33,7 +33,7 @@ extern "C" {
 #include <string>
 #include <stdexcept>
 
-#include <ginac.h>
+#include <GiNaC/ginac.h>
 
 #include "ginsh.h"