- building GiNaC in a separate directory now works

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index db541b8bb3204fcef645ccbc75e9914870dc67bf..000c5ee1f1c4f0a2b02ad01ff4c6c8195fad2985 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -5,7 +5,8 @@
 index.html:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileHTML..."; \
 index.html:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileHTML..."; \

-         ${DOXYGEN} DoxyfileHTML; \
+         (cd ${srcdir}; \
+         ${DOXYGEN} DoxyfileHTML); \

        else \
          echo "warning: target reference_html disabled by configuration"; \
        fi
        else \
          echo "warning: target reference_html disabled by configuration"; \
        fi


@@ -16,7 +17,8 @@ latex::
 latex/reference.tex:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileTEX..."; \
 latex/reference.tex:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileTEX..."; \

-         ${DOXYGEN} DoxyfileTEX; \
+         (cd ${srcdir}; \
+         ${DOXYGEN} DoxyfileTEX); \

          mv ${srcdir}/latex/refman.tex ${srcdir}/latex/reference.tex; \
        else \
          echo "warning: target reference.tex disabled by configuration"; \
          mv ${srcdir}/latex/refman.tex ${srcdir}/latex/reference.tex; \
        else \
          echo "warning: target reference.tex disabled by configuration"; \


@@ -55,26 +57,16 @@ install-data-local:
          echo " $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css"; \
          $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css; \
        fi
          echo " $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css"; \
          $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css; \
        fi

-       @for p in *.html; do \
-         if [ -f $(srcdir)/$$p ]; then \
-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \
-         fi; \
+       @for p in `echo $(srcdir)/*.html | sed 's,[^ ]*/,,g'`; do \
+         echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
+         $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \

        done
        done

-       @for p in *.gif; do \
-         if [ -f $(srcdir)/$$p ]; then \
-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \
-         fi; \
+       @for p in `echo $(srcdir)/*.gif | sed 's,[^ ]*/,,g'`; do \
+         echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
+         $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \

        done
 
 uninstall-local:
        rm -f $(DESTDIR)$(ginacreferencedir)/doxygen.css
        done
 
 uninstall-local:
        rm -f $(DESTDIR)$(ginacreferencedir)/doxygen.css

-       @for p in *.html; do \
-         echo " rm -f $(DESTDIR)$(ginacreferencedir)/$$p"; \
-         rm -f $(DESTDIR)$(ginacreferencedir)/$$p; \
-       done
-       @for p in *.gif; do \
-         echo " rm -f $(DESTDIR)$(ginacreferencedir)/$$p"; \
-         rm -f $(DESTDIR)$(ginacreferencedir)/$$p; \
-       done
+       rm -f $(DESTDIR)$(ginacreferencedir)/*.html
+       rm -f $(DESTDIR)$(ginacreferencedir)/*.gif

diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in
index b57766146018c8a96ca902deff051d6fb84873ca..dedcc9507dc7c4afda84c404c17fe57a8ef30aa8 100644 (file)
--- a/doc/reference/Makefile.in
+++ b/doc/reference/Makefile.in
@@ -242,7 +242,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 index.html:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileHTML..."; \
 index.html:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileHTML..."; \

-         ${DOXYGEN} DoxyfileHTML; \
+         (cd ${srcdir}; \
+         ${DOXYGEN} DoxyfileHTML); \

        else \
          echo "warning: target reference_html disabled by configuration"; \
        fi
        else \
          echo "warning: target reference_html disabled by configuration"; \
        fi


@@ -253,7 +254,8 @@ latex::
 latex/reference.tex:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileTEX..."; \
 latex/reference.tex:
        @if [ "${DOXYGEN}" ]; then \
          echo "Running ${DOXYGEN} DoxyfileTEX..."; \

-         ${DOXYGEN} DoxyfileTEX; \
+         (cd ${srcdir}; \
+         ${DOXYGEN} DoxyfileTEX); \

          mv ${srcdir}/latex/refman.tex ${srcdir}/latex/reference.tex; \
        else \
          echo "warning: target reference.tex disabled by configuration"; \
          mv ${srcdir}/latex/refman.tex ${srcdir}/latex/reference.tex; \
        else \
          echo "warning: target reference.tex disabled by configuration"; \


@@ -285,29 +287,19 @@ install-data-local:
          echo " $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css"; \
          $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css; \
        fi
          echo " $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css"; \
          $(INSTALL_DATA) $(srcdir)/doxygen.css $(DESTDIR)$(ginacreferencedir)/doxygen.css; \
        fi

-       @for p in *.html; do \
-         if [ -f $(srcdir)/$$p ]; then \
-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \
-         fi; \
+       @for p in `echo $(srcdir)/*.html | sed 's,[^ ]*/,,g'`; do \
+         echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
+         $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \

        done
        done

-       @for p in *.gif; do \
-         if [ -f $(srcdir)/$$p ]; then \
-           echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
-           $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \
-         fi; \
+       @for p in `echo $(srcdir)/*.gif | sed 's,[^ ]*/,,g'`; do \
+         echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p"; \
+         $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(ginacreferencedir)/$$p; \

        done
 
 uninstall-local:
        rm -f $(DESTDIR)$(ginacreferencedir)/doxygen.css
        done
 
 uninstall-local:
        rm -f $(DESTDIR)$(ginacreferencedir)/doxygen.css

-       @for p in *.html; do \
-         echo " rm -f $(DESTDIR)$(ginacreferencedir)/$$p"; \
-         rm -f $(DESTDIR)$(ginacreferencedir)/$$p; \
-       done
-       @for p in *.gif; do \
-         echo " rm -f $(DESTDIR)$(ginacreferencedir)/$$p"; \
-         rm -f $(DESTDIR)$(ginacreferencedir)/$$p; \
-       done
+       rm -f $(DESTDIR)$(ginacreferencedir)/*.html
+       rm -f $(DESTDIR)$(ginacreferencedir)/*.gif

 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index fc1e74b9be436d4dd1c9f318d73aaac8f301b1ea..2ddabe8ee4152e594b854e20bf20d1b6f00237bd 100644 (file)
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -8,18 +8,18 @@ TXT = $(addsuffix .txt, $(basename $(FIG)))
 
 SUFFIXES = .fig .png .eps .txt
 
 
 SUFFIXES = .fig .png .eps .txt
 

-%.eps: %.fig
+.fig.eps:

        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L eps -m 0.9 $< $@..."; \
        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L eps -m 0.9 $< $@..."; \

-         ${FIG2DEV} -L eps -m 0.9 $< $@; \
+         cd $(srcdir) && ${FIG2DEV} -L eps -m 0.9 $< $@; \

        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
 
        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
 

-%.png: %.fig
+.fig.png:

        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L png $< $@..."; \
        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L png $< $@..."; \

-         ${FIG2DEV} -L png $< $@; \
+         cd $(srcdir) && ${FIG2DEV} -L png $< $@; \

        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
        else \
          echo "warning: fig2dev was not found by configure"; \
        fi

diff --git a/doc/tutorial/Makefile.in b/doc/tutorial/Makefile.in
index 3193c916aa97b6f5b6bf091173c46747e00ca797..19ce30c172df8c466dd3a35840117e224f7c1c33 100644 (file)
--- a/doc/tutorial/Makefile.in
+++ b/doc/tutorial/Makefile.in
@@ -121,6 +121,11 @@ EXTRA_DIST = $(FIG) $(TXT)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 

+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@

 TEXI2DVI = texi2dvi
 INFO_DEPS = ginac.info
 DVIS = ginac.dvi
 TEXI2DVI = texi2dvi
 INFO_DEPS = ginac.info
 DVIS = ginac.dvi


@@ -396,18 +401,18 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 

-%.eps: %.fig
+.fig.eps:

        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L eps -m 0.9 $< $@..."; \
        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L eps -m 0.9 $< $@..."; \

-         ${FIG2DEV} -L eps -m 0.9 $< $@; \
+         cd $(srcdir) && ${FIG2DEV} -L eps -m 0.9 $< $@; \

        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
 
        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
 

-%.png: %.fig
+.fig.png:

        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L png $< $@..."; \
        @if [ "${FIG2DEV}" ]; then \
          echo "Running ${FIG2DEV} -L png $< $@..."; \

-         ${FIG2DEV} -L png $< $@; \
+         cd $(srcdir) && ${FIG2DEV} -L png $< $@; \

        else \
          echo "warning: fig2dev was not found by configure"; \
        fi
        else \
          echo "warning: fig2dev was not found by configure"; \
        fi

diff --git a/ginac/Makefile.am b/ginac/Makefile.am
index 1035e836d984e493da597bb96518f0669b34ec98..271230936f9a8020c6d9c68103e3c686cbd40514 100644 (file)
--- a/ginac/Makefile.am
+++ b/ginac/Makefile.am
@@ -21,14 +21,14 @@ ginacinclude_HEADERS = ginac.h add.h archive.h basic.h clifford.h color.h \
 EXTRA_DIST = container.pl function.pl structure.pl
 
 # Files which are generated by perl scripts
 EXTRA_DIST = container.pl function.pl structure.pl
 
 # Files which are generated by perl scripts

-function.h function.cpp: function.pl
-       perl function.pl
+$(srcdir)/function.h $(srcdir)/function.cpp: $(srcdir)/function.pl
+       cd $(srcdir) && perl function.pl

 
 

-lst.h lst.cpp: container.pl
-       perl container.pl lst
+$(srcdir)/lst.h $(srcdir)/lst.cpp: $(srcdir)/container.pl
+       cd $(srcdir) && perl container.pl lst

 
 

-exprseq.h exprseq.cpp: container.pl
-       perl container.pl exprseq
+$(srcdir)/exprseq.h $(srcdir)/exprseq.cpp: $(srcdir)/container.pl
+       cd $(srcdir) && perl container.pl exprseq

 
 # Force build of headers before compilation
 
 # Force build of headers before compilation

-add.cpp: function.h lst.h exprseq.h
+$(srcdir)/add.cpp: $(srcdir)/function.h $(srcdir)/lst.h $(srcdir)/exprseq.h

diff --git a/ginac/Makefile.in b/ginac/Makefile.in
index 4e9f5a7226d89176a4f2bec4796295cf329c5026..458d04903758f0a63148211280407067fe8f75fb 100644 (file)
--- a/ginac/Makefile.in
+++ b/ginac/Makefile.in
@@ -430,17 +430,17 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Files which are generated by perl scripts
 
 
 # Files which are generated by perl scripts

-function.h function.cpp: function.pl
-       perl function.pl
+$(srcdir)/function.h $(srcdir)/function.cpp: $(srcdir)/function.pl
+       cd $(srcdir) && perl function.pl

 
 

-lst.h lst.cpp: container.pl
-       perl container.pl lst
+$(srcdir)/lst.h $(srcdir)/lst.cpp: $(srcdir)/container.pl
+       cd $(srcdir) && perl container.pl lst

 
 

-exprseq.h exprseq.cpp: container.pl
-       perl container.pl exprseq
+$(srcdir)/exprseq.h $(srcdir)/exprseq.cpp: $(srcdir)/container.pl
+       cd $(srcdir) && perl container.pl exprseq

 
 # Force build of headers before compilation
 
 # Force build of headers before compilation

-add.cpp: function.h lst.h exprseq.h
+$(srcdir)/add.cpp: $(srcdir)/function.h $(srcdir)/lst.h $(srcdir)/exprseq.h

 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/ginac/add.h b/ginac/add.h
index 51cb4f104eba044a8c2f5bc458a56c5946792961..d267f25cc2a7e5f8f644350bb0120047b06c9a05 100644 (file)
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -23,7 +23,7 @@
 #ifndef __GINAC_ADD_H__
 #define __GINAC_ADD_H__
 
 #ifndef __GINAC_ADD_H__
 #define __GINAC_ADD_H__
 

-#include <ginac/expairseq.h>
+#include "expairseq.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/archive.h b/ginac/archive.h
index 7b464a22ec2394225eed6378a9e128ed2d9eff3c..e24ef7ac22b0b3266a5b4d708a44935c92fc47f5 100644 (file)
--- a/ginac/archive.h
+++ b/ginac/archive.h
@@ -23,7 +23,7 @@
 #ifndef __GINAC_ARCHIVE_H__
 #define __GINAC_ARCHIVE_H__
 
 #ifndef __GINAC_ARCHIVE_H__
 #define __GINAC_ARCHIVE_H__
 

-#include <ginac/ex.h>
+#include "ex.h"

 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

diff --git a/ginac/basic.h b/ginac/basic.h
index e763de5d63f9e90841b02da38d6cb05708b62022..7305b35af0e1dddc9a4f4514d5112c276539f19b 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -30,10 +30,10 @@
 // CINT needs <algorithm> to work properly with <vector> 
 #include <algorithm>
 
 // CINT needs <algorithm> to work properly with <vector> 
 #include <algorithm>
 

-#include <ginac/flags.h>
-#include <ginac/tinfos.h>
-#include <ginac/assertion.h>
-#include <ginac/registrar.h>
+#include "flags.h"
+#include "tinfos.h"
+#include "assertion.h"
+#include "registrar.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/clifford.h b/ginac/clifford.h
index a2deeb5272f87918f6b1ab4957164d84e5fa1890..5abd6aeecd184a2a72a2f29bdd66b38ccd8f2d9b 100644 (file)
--- a/ginac/clifford.h
+++ b/ginac/clifford.h
@@ -24,8 +24,8 @@
 #define __GINAC_CLIFFORD_H__
 
 #include <string>
 #define __GINAC_CLIFFORD_H__
 
 #include <string>

-#include <ginac/indexed.h>
-#include <ginac/ex.h>
+#include "indexed.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/color.h b/ginac/color.h
index c6c4ca04a5e1dd64d5789f91d247f1b0380e3567..160aea130101bc6e1ed938e307bc39b491b62c54 100644 (file)
--- a/ginac/color.h
+++ b/ginac/color.h
@@ -25,8 +25,8 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <ginac/indexed.h>
-#include <ginac/ex.h>
+#include "indexed.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/coloridx.h b/ginac/coloridx.h
index 266dcf9276be0c25852b91b71462b0d7ed1d526b..5be2970f6065c3df8b86d16caaeaa16bc687943f 100644 (file)
--- a/ginac/coloridx.h
+++ b/ginac/coloridx.h
@@ -25,8 +25,8 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <ginac/idx.h>
-#include <ginac/ex.h>
+#include "idx.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/constant.h b/ginac/constant.h
index 90193714b1cad0c0d6fedd0f510863f670be84a7..e70a211486c7e0f26b3cdb27a63e7355d517884d 100644 (file)
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -24,7 +24,7 @@
 #define __GINAC_CONSTANT_H__
 
 #include <string>
 #define __GINAC_CONSTANT_H__
 
 #include <string>

-#include <ginac/basic.h>
+#include "basic.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/container.pl b/ginac/container.pl
index f04c7067bf0809c49e0c2e5e609a0ad19e3deb83..077018c2ca586c1281a4afd58aaea78faea6e6ae 100755 (executable)
--- a/ginac/container.pl
+++ b/ginac/container.pl
@@ -127,8 +127,8 @@ $interface=<<END_OF_INTERFACE;
 // CINT needs <algorithm> to work properly with <vector> and <list> 
 #include <algorithm>
 
 // CINT needs <algorithm> to work properly with <vector> and <list> 
 #include <algorithm>
 

-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/ex.h b/ginac/ex.h
index a39fe2e789e0fd9861e6d04abd0f5f4a76698359..b098d582d31750ff3510801a861014dd80bd05ff 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -24,8 +24,8 @@
 #define __GINAC_EX_H__
 
 #include <iostream>
 #define __GINAC_EX_H__
 
 #include <iostream>

-#include <ginac/basic.h>
-#include <ginac/operators.h>
+#include "basic.h"
+#include "operators.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/expair.h b/ginac/expair.h
index 25fc36f331434e26b6f9fbdd7a69b4ebfd7e9148..dd0459b924f0294241ebb97c0e1f9a7d08df0dd4 100644 (file)
--- a/ginac/expair.h
+++ b/ginac/expair.h
@@ -23,8 +23,8 @@
 #ifndef __GINAC_EXPAIR_H__
 #define __GINAC_EXPAIR_H__
 
 #ifndef __GINAC_EXPAIR_H__
 #define __GINAC_EXPAIR_H__
 

-#include <ginac/ex.h>
-#include <ginac/numeric.h>
+#include "ex.h"
+#include "numeric.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index 8be797dc1a68d5e4570ee0fa268a012e73ca714e..f50395396d0e71b61e5208ec77e3a9f415a291ee 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -29,7 +29,7 @@
 // CINT needs <algorithm> to work properly with <vector> and <list>
 //#include <algorithm>
 
 // CINT needs <algorithm> to work properly with <vector> and <list>
 //#include <algorithm>
 

-#include <ginac/expair.h>
+#include "expair.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/fail.h b/ginac/fail.h
index efcb4eb9a2a0ae7a69c2092071301f3a28300610..9a0a3ffee792c30404c79a5450ebe5ea35ebee5b 100644 (file)
--- a/ginac/fail.h
+++ b/ginac/fail.h
@@ -24,7 +24,7 @@
 #ifndef __GINAC_FAIL_H__
 #define __GINAC_FAIL_H__
 
 #ifndef __GINAC_FAIL_H__
 #define __GINAC_FAIL_H__
 

-#include <ginac/basic.h>
+#include "basic.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/function.pl b/ginac/function.pl
index dfa3fb0d9cf111de2d1d0d3753330091d28cfdfa..f1b57f13db56419afbb78b6e9326c91fdd9e75dc 100755 (executable)
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -169,7 +169,7 @@ $interface=<<END_OF_INTERFACE;
 #include <algorithm>
 #endif // def __CINT__
 
 #include <algorithm>
 #endif // def __CINT__
 

-#include <ginac/exprseq.h>
+#include "exprseq.h"

 
 #ifndef NO_GINAC_NAMESPACE
 
 
 #ifndef NO_GINAC_NAMESPACE
 

diff --git a/ginac/ginac.h b/ginac/ginac.h
index c91d06c44f39b91e29cbdc41bf39c54b6779fcbb..491b05667a2b60526deed34910c04029eef67b09 100644 (file)
--- a/ginac/ginac.h
+++ b/ginac/ginac.h
@@ -23,45 +23,45 @@
 #ifndef __GINAC_H__
 #define __GINAC_H__
 
 #ifndef __GINAC_H__
 #define __GINAC_H__
 

-#include <ginac/basic.h>
+#include "basic.h"

 
 

-#include <ginac/ex.h>
-#include <ginac/normal.h>
-#include <ginac/archive.h>
+#include "ex.h"
+#include "normal.h"
+#include "archive.h"

 
 

-#include <ginac/constant.h>
-#include <ginac/fail.h>
-#include <ginac/idx.h>
-#include <ginac/lst.h>
-#include <ginac/matrix.h>
-#include <ginac/numeric.h>
-#include <ginac/power.h>
-#include <ginac/relational.h>
-#include <ginac/structure.h>
-#include <ginac/symbol.h>
+#include "constant.h"
+#include "fail.h"
+#include "idx.h"
+#include "lst.h"
+#include "matrix.h"
+#include "numeric.h"
+#include "power.h"
+#include "relational.h"
+#include "structure.h"
+#include "symbol.h"

 
 

-#include <ginac/expair.h>
-#include <ginac/expairseq.h>
-#include <ginac/add.h>
-#include <ginac/mul.h>
-#include <ginac/pseries.h>
+#include "expair.h"
+#include "expairseq.h"
+#include "add.h"
+#include "mul.h"
+#include "pseries.h"

 
 

-#include <ginac/exprseq.h>
-#include <ginac/function.h>
-#include <ginac/ncmul.h>
+#include "exprseq.h"
+#include "function.h"
+#include "ncmul.h"

 
 

-#include <ginac/inifcns.h>
-#include <ginac/operators.h>
+#include "inifcns.h"
+#include "operators.h"

 
 #ifndef GINAC_BASE_ONLY
 
 #ifndef GINAC_BASE_ONLY

-#include <ginac/indexed.h>
-#include <ginac/clifford.h>
-#include <ginac/coloridx.h>
-#include <ginac/color.h>
-#include <ginac/isospin.h>
-#include <ginac/lorentzidx.h>
-#include <ginac/simp_lor.h>
-#include <ginac/lortensor.h>
+#include "indexed.h"
+#include "clifford.h"
+#include "coloridx.h"
+#include "color.h"
+#include "isospin.h"
+#include "lorentzidx.h"
+#include "simp_lor.h"
+#include "lortensor.h"

 #endif // ndef GINAC_BASE_ONLY
 
 #endif // ndef __GINAC_H__
 #endif // ndef GINAC_BASE_ONLY
 
 #endif // ndef __GINAC_H__

diff --git a/ginac/idx.h b/ginac/idx.h
index c8a27a96e93fa657cd81555208535e7e8948bfa4..5bfa9bf102cff9ba7187cab26301a71d651ebb29 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -25,8 +25,8 @@
 
 #include <string>
 //#include <vector>
 
 #include <string>
 //#include <vector>

-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/indexed.h b/ginac/indexed.h
index 5b5856e5838f8021a5e859a392b25911a5b266f4..556f92ff2e9b8dd2e3d24e7e58499bbaa6ec01f6 100644 (file)
--- a/ginac/indexed.h
+++ b/ginac/indexed.h
@@ -24,7 +24,7 @@
 #define __GINAC_INDEXED_H__
 
 #include <string>
 #define __GINAC_INDEXED_H__
 
 #include <string>

-#include <ginac/exprseq.h>
+#include "exprseq.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/inifcns.h b/ginac/inifcns.h
index dfaea514be114fde5628dfb1d8e14a19dd015bd7..20511e2828e82ced2c53474dddc86d9837e9787d 100644 (file)
--- a/ginac/inifcns.h
+++ b/ginac/inifcns.h
@@ -23,8 +23,8 @@
 #ifndef __GINAC_INIFCNS_H__
 #define __GINAC_INIFCNS_H__
 
 #ifndef __GINAC_INIFCNS_H__
 #define __GINAC_INIFCNS_H__
 

-#include <ginac/function.h>
-#include <ginac/ex.h>
+#include "function.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/isospin.h b/ginac/isospin.h
index 8988fef11cbeca0eaa67d16984e67de37862c67e..8bd084b586f107c14e97086833cba44295eacbdd 100644 (file)
--- a/ginac/isospin.h
+++ b/ginac/isospin.h
@@ -24,7 +24,7 @@
 #define __GINAC_ISOSPIN_H__
 
 #include <string>
 #define __GINAC_ISOSPIN_H__
 
 #include <string>

-#include <ginac/indexed.h>
+#include "indexed.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/lorentzidx.h b/ginac/lorentzidx.h
index 25c91723a5d8476e686f475d1c739acc70ba7f10..a0ff8d53545f7e7df4a21ec2c31117825285400b 100644 (file)
--- a/ginac/lorentzidx.h
+++ b/ginac/lorentzidx.h
@@ -25,7 +25,7 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <ginac/idx.h>
+#include "idx.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/lortensor.h b/ginac/lortensor.h
index e3cb75d09513907688f2f2bd811f58cff2588cc6..bfeff485d8c4155b81e55f09ec615b7f86ac51c2 100644 (file)
--- a/ginac/lortensor.h
+++ b/ginac/lortensor.h
@@ -25,10 +25,10 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include "config.h"

 #include <iostream>
 #include <iostream>

-#include <ginac/indexed.h>
-#include <ginac/lorentzidx.h>
+#include "config.h"
+#include "indexed.h"
+#include "lorentzidx.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/matrix.h b/ginac/matrix.h
index 23d2a475c894ef6a87e06990c38369d20269a3cb..b78a750e28bc33ef73dfdf6db056258e6dda1c47 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -24,8 +24,8 @@
 #define __GINAC_MATRIX_H__
 
 #include <vector>
 #define __GINAC_MATRIX_H__
 
 #include <vector>

-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/mul.h b/ginac/mul.h
index b3e97084d0a632131620ad7ad50c9163b9bd20d4..d81d046b60afcfec2fb8f4ada520b000186e738e 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -23,7 +23,7 @@
 #ifndef __GINAC_MUL_H__
 #define __GINAC_MUL_H__
 
 #ifndef __GINAC_MUL_H__
 #define __GINAC_MUL_H__
 

-#include <ginac/expairseq.h>
+#include "expairseq.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index d04af7f5df982bb492e0eed88bdd61ac0aa89357..cba21283e5168f63119b57d2e74f7e41230903f6 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -23,7 +23,7 @@
 #ifndef __GINAC_NCMUL_H__
 #define __GINAC_NCMUL_H__
 
 #ifndef __GINAC_NCMUL_H__
 #define __GINAC_NCMUL_H__
 

-#include <ginac/exprseq.h>
+#include "exprseq.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/numeric.h b/ginac/numeric.h
index e899666d6fe4e2cac6274075fb18d9cec9abbc17..d99f08dcda4ab9c25b96a722e200898d5929a95d 100644 (file)
--- a/ginac/numeric.h
+++ b/ginac/numeric.h
@@ -24,8 +24,8 @@
 #define __GINAC_NUMERIC_H__
 
 #include <strstream>
 #define __GINAC_NUMERIC_H__
 
 #include <strstream>

-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"

 
 class cl_N;     // We want to include cln.h only in numeric.cpp in order to 
                 // avoid namespace pollution and keep compile-time low.
 
 class cl_N;     // We want to include cln.h only in numeric.cpp in order to 
                 // avoid namespace pollution and keep compile-time low.

diff --git a/ginac/power.h b/ginac/power.h
index 7be32619992092b1481fb247db5cb4e5d495b032..a0ebc29bf213aa8b6c542839f5aa252053db2905 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -23,8 +23,8 @@
 #ifndef __GINAC_POWER_H__
 #define __GINAC_POWER_H__
 
 #ifndef __GINAC_POWER_H__
 #define __GINAC_POWER_H__
 

-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/pseries.h b/ginac/pseries.h
index 0fd9989092e84ed341f04590139e70681b0354f1..aed1e99ab336be0110fbbea413e933ed35de441c 100644 (file)
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -23,8 +23,8 @@
 #ifndef __GINAC_SERIES_H__
 #define __GINAC_SERIES_H__
 
 #ifndef __GINAC_SERIES_H__
 #define __GINAC_SERIES_H__
 

-#include <ginac/basic.h>
-#include <ginac/expairseq.h>
+#include "basic.h"
+#include "expairseq.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/relational.h b/ginac/relational.h
index 39b44fb8370ddc69254df02b1a6f9be89e2ef26e..a41831e88da9416ecf9022b9a9455bb869b1fd33 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -23,8 +23,8 @@
 #ifndef __GINAC_RELATIONAL_H__
 #define __GINAC_RELATIONAL_H__
 
 #ifndef __GINAC_RELATIONAL_H__
 #define __GINAC_RELATIONAL_H__
 

-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/simp_lor.h b/ginac/simp_lor.h
index 5fa9446a932adf11386192d2d905c7e0ac7ad414..288579937b1b448c0b537de0bfe834be2bffd446 100644 (file)
--- a/ginac/simp_lor.h
+++ b/ginac/simp_lor.h
@@ -28,8 +28,8 @@
 #include <utility>
 #include <map>
 #include <iostream>
 #include <utility>
 #include <map>
 #include <iostream>

-#include <ginac/indexed.h>
-#include <ginac/lorentzidx.h>
+#include "indexed.h"
+#include "lorentzidx.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/structure.h b/ginac/structure.h
index 6eae91359731e2e49fdc00374cd9588271c7e082..1e1bed02c94e5b60330747d4814155410413a4d7 100644 (file)
--- a/ginac/structure.h
+++ b/ginac/structure.h
@@ -23,7 +23,7 @@
 #ifndef __GINAC_STRUCTURE_H__
 #define __GINAC_STRUCTURE_H__
 
 #ifndef __GINAC_STRUCTURE_H__
 #define __GINAC_STRUCTURE_H__
 

-#include <ginac/basic.h>
+#include "basic.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/structure.pl b/ginac/structure.pl
index 206a24cc14bf9c202d53153f087c4123506764d2..223b8c70e2bf192c157a9560a4011a9e6b41ee8d 100755 (executable)
--- a/ginac/structure.pl
+++ b/ginac/structure.pl
@@ -148,7 +148,7 @@ ${input_structure}
 #ifndef __GINAC_${STRUCTURE_UC}_H__
 #define __GINAC_${STRUCTURE_UC}_H__
 
 #ifndef __GINAC_${STRUCTURE_UC}_H__
 #define __GINAC_${STRUCTURE_UC}_H__
 

-#include <ginac/structure.h>
+#include "structure.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 1329054d923b58bc504a1ac584a2420c244668d6..d9fab6a3af9911c80dcbdd32296c8e857cb91daf 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -24,8 +24,8 @@
 #define __GINAC_SYMBOL_H__
 
 #include <string>
 #define __GINAC_SYMBOL_H__
 
 #include <string>

-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"

 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
 
 #ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {

diff --git a/ginsh/Makefile.am b/ginsh/Makefile.am
index 3f514141fa5fc200d6d19c5b3253e5565afda275..0c3479b043b5fc46216b49593beeee3bd065130e 100644 (file)
--- a/ginsh/Makefile.am
+++ b/ginsh/Makefile.am
@@ -3,6 +3,7 @@
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)

+INCLUDES = -I$(srcdir)/../ginac

 man_MANS = ginsh.1
 YFLAGS = -d
 EXTRA_DIST = $(man_MANS) ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed
 man_MANS = ginsh.1
 YFLAGS = -d
 EXTRA_DIST = $(man_MANS) ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed

diff --git a/ginsh/Makefile.in b/ginsh/Makefile.in
index 7413d5509a11709d8b9b55c17e83432da0e7ac8a..bb1c9d77089fc2e42af4b2e045a1904f6198cf54 100644 (file)
--- a/ginsh/Makefile.in
+++ b/ginsh/Makefile.in
@@ -104,6 +104,7 @@ YACC = @YACC@
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 bin_PROGRAMS = ginsh
 ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)

+INCLUDES = -I$(srcdir)/../ginac

 man_MANS = ginsh.1
 YFLAGS = -d
 EXTRA_DIST = $(man_MANS) ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed
 man_MANS = ginsh.1
 YFLAGS = -d
 EXTRA_DIST = $(man_MANS) ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed

diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h
index 351e476eccf6d72b6ff55dc0d2d98aa120133ec2..735d4b96a3a4341610f3788f83135583dde0e31f 100644 (file)
--- a/ginsh/ginsh.h
+++ b/ginsh/ginsh.h
@@ -41,7 +41,7 @@ extern "C" {
 }
 #endif
 
 }
 #endif
 

-#include <ginac/ginac.h>
+#include "ginac.h"

 
 #ifndef NO_GINAC_NAMESPACE
 using namespace GiNaC;
 
 #ifndef NO_GINAC_NAMESPACE
 using namespace GiNaC;

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6c0939f8889810293ddd4640c2ea7949243d3775..6fbf00a8b36cbfd54e2d3c3b0ba4f2c2675d157e 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,5 +3,6 @@
 bin_PROGRAMS = viewgar
 viewgar_SOURCES = viewgar.cpp
 viewgar_LDADD = ../ginac/libginac.la
 bin_PROGRAMS = viewgar
 viewgar_SOURCES = viewgar.cpp
 viewgar_LDADD = ../ginac/libginac.la

+INCLUDES = -I$(srcdir)/../ginac

 man_MANS = viewgar.1
 EXTRA_DIST = $(man_MANS)
 man_MANS = viewgar.1
 EXTRA_DIST = $(man_MANS)

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 80ccb43b5417317fa8bc63942800f2ac16b1c7af..88364a6a313ba20beb0573175c228ac025b5e690 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -104,6 +104,7 @@ YACC = @YACC@
 bin_PROGRAMS = viewgar
 viewgar_SOURCES = viewgar.cpp
 viewgar_LDADD = ../ginac/libginac.la
 bin_PROGRAMS = viewgar
 viewgar_SOURCES = viewgar.cpp
 viewgar_LDADD = ../ginac/libginac.la

+INCLUDES = -I$(srcdir)/../ginac

 man_MANS = viewgar.1
 EXTRA_DIST = $(man_MANS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 man_MANS = viewgar.1
 EXTRA_DIST = $(man_MANS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

diff --git a/tools/viewgar.cpp b/tools/viewgar.cpp
index 79f992913470a53311af93dca350742f45174a7f..6fc8c23af72344f4fba52a087a704ad6833b4a43 100644 (file)
--- a/tools/viewgar.cpp
+++ b/tools/viewgar.cpp
@@ -24,7 +24,7 @@
 #include <fstream>
 #include <stdexcept>
 
 #include <fstream>
 #include <stdexcept>
 

-#include <ginac/ginac.h>
+#include "ginac.h"

 using namespace GiNaC;
 
 int main(int argc, char **argv)
 using namespace GiNaC;
 
 int main(int argc, char **argv)