From dbb36db8d02b2c25af6bbfff8135112637936e1f Mon Sep 17 00:00:00 2001 From: Christian Bauer Date: Thu, 27 Jan 2000 18:26:09 +0000 Subject: [PATCH] - building GiNaC in a separate directory now works --- doc/reference/Makefile.am | 32 ++++++++------------ doc/reference/Makefile.in | 32 ++++++++------------ doc/tutorial/Makefile.am | 8 ++--- doc/tutorial/Makefile.in | 13 +++++--- ginac/Makefile.am | 14 ++++----- ginac/Makefile.in | 14 ++++----- ginac/add.h | 2 +- ginac/archive.h | 2 +- ginac/basic.h | 8 ++--- ginac/clifford.h | 4 +-- ginac/color.h | 4 +-- ginac/coloridx.h | 4 +-- ginac/constant.h | 2 +- ginac/container.pl | 4 +-- ginac/ex.h | 4 +-- ginac/expair.h | 4 +-- ginac/expairseq.h | 2 +- ginac/fail.h | 2 +- ginac/function.pl | 2 +- ginac/ginac.h | 64 +++++++++++++++++++-------------------- ginac/idx.h | 4 +-- ginac/indexed.h | 2 +- ginac/inifcns.h | 4 +-- ginac/isospin.h | 2 +- ginac/lorentzidx.h | 2 +- ginac/lortensor.h | 6 ++-- ginac/matrix.h | 4 +-- ginac/mul.h | 2 +- ginac/ncmul.h | 2 +- ginac/numeric.h | 4 +-- ginac/power.h | 4 +-- ginac/pseries.h | 4 +-- ginac/relational.h | 4 +-- ginac/simp_lor.h | 4 +-- ginac/structure.h | 2 +- ginac/structure.pl | 2 +- ginac/symbol.h | 4 +-- ginsh/Makefile.am | 1 + ginsh/Makefile.in | 1 + ginsh/ginsh.h | 2 +- tools/Makefile.am | 1 + tools/Makefile.in | 1 + tools/viewgar.cpp | 2 +- 43 files changed, 139 insertions(+), 146 deletions(-) diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index db541b8b..000c5ee1 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -5,7 +5,8 @@ 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 @@ -16,7 +17,8 @@ latex:: 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"; \ @@ -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 - @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 - @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 - @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 b5776614..dedcc950 100644 --- 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..."; \ - ${DOXYGEN} DoxyfileHTML; \ + (cd ${srcdir}; \ + ${DOXYGEN} DoxyfileHTML); \ 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..."; \ - ${DOXYGEN} DoxyfileTEX; \ + (cd ${srcdir}; \ + ${DOXYGEN} DoxyfileTEX); \ 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 - @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 - @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 - @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. diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am index fc1e74b9..2ddabe8e 100644 --- a/doc/tutorial/Makefile.am +++ b/doc/tutorial/Makefile.am @@ -8,18 +8,18 @@ TXT = $(addsuffix .txt, $(basename $(FIG))) SUFFIXES = .fig .png .eps .txt -%.eps: %.fig +.fig.eps: @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 -%.png: %.fig +.fig.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 diff --git a/doc/tutorial/Makefile.in b/doc/tutorial/Makefile.in index 3193c916..19ce30c1 100644 --- 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 = +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 @@ -396,18 +401,18 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -%.eps: %.fig +.fig.eps: @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 -%.png: %.fig +.fig.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 diff --git a/ginac/Makefile.am b/ginac/Makefile.am index 1035e836..27123093 100644 --- 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 -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 -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 4e9f5a72..458d0490 100644 --- 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 -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 -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. diff --git a/ginac/add.h b/ginac/add.h index 51cb4f10..d267f25c 100644 --- a/ginac/add.h +++ b/ginac/add.h @@ -23,7 +23,7 @@ #ifndef __GINAC_ADD_H__ #define __GINAC_ADD_H__ -#include +#include "expairseq.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/archive.h b/ginac/archive.h index 7b464a22..e24ef7ac 100644 --- a/ginac/archive.h +++ b/ginac/archive.h @@ -23,7 +23,7 @@ #ifndef __GINAC_ARCHIVE_H__ #define __GINAC_ARCHIVE_H__ -#include +#include "ex.h" #include #include diff --git a/ginac/basic.h b/ginac/basic.h index e763de5d..7305b35a 100644 --- a/ginac/basic.h +++ b/ginac/basic.h @@ -30,10 +30,10 @@ // CINT needs to work properly with #include -#include -#include -#include -#include +#include "flags.h" +#include "tinfos.h" +#include "assertion.h" +#include "registrar.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/clifford.h b/ginac/clifford.h index a2deeb52..5abd6aee 100644 --- a/ginac/clifford.h +++ b/ginac/clifford.h @@ -24,8 +24,8 @@ #define __GINAC_CLIFFORD_H__ #include -#include -#include +#include "indexed.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/color.h b/ginac/color.h index c6c4ca04..160aea13 100644 --- a/ginac/color.h +++ b/ginac/color.h @@ -25,8 +25,8 @@ #include #include -#include -#include +#include "indexed.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/coloridx.h b/ginac/coloridx.h index 266dcf92..5be2970f 100644 --- a/ginac/coloridx.h +++ b/ginac/coloridx.h @@ -25,8 +25,8 @@ #include #include -#include -#include +#include "idx.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/constant.h b/ginac/constant.h index 90193714..e70a2114 100644 --- a/ginac/constant.h +++ b/ginac/constant.h @@ -24,7 +24,7 @@ #define __GINAC_CONSTANT_H__ #include -#include +#include "basic.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/container.pl b/ginac/container.pl index f04c7067..077018c2 100755 --- a/ginac/container.pl +++ b/ginac/container.pl @@ -127,8 +127,8 @@ $interface=< to work properly with and #include -#include -#include +#include "basic.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/ex.h b/ginac/ex.h index a39fe2e7..b098d582 100644 --- a/ginac/ex.h +++ b/ginac/ex.h @@ -24,8 +24,8 @@ #define __GINAC_EX_H__ #include -#include -#include +#include "basic.h" +#include "operators.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/expair.h b/ginac/expair.h index 25fc36f3..dd0459b9 100644 --- a/ginac/expair.h +++ b/ginac/expair.h @@ -23,8 +23,8 @@ #ifndef __GINAC_EXPAIR_H__ #define __GINAC_EXPAIR_H__ -#include -#include +#include "ex.h" +#include "numeric.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/expairseq.h b/ginac/expairseq.h index 8be797dc..f5039539 100644 --- a/ginac/expairseq.h +++ b/ginac/expairseq.h @@ -29,7 +29,7 @@ // CINT needs to work properly with and //#include -#include +#include "expair.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/fail.h b/ginac/fail.h index efcb4eb9..9a0a3ffe 100644 --- a/ginac/fail.h +++ b/ginac/fail.h @@ -24,7 +24,7 @@ #ifndef __GINAC_FAIL_H__ #define __GINAC_FAIL_H__ -#include +#include "basic.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/function.pl b/ginac/function.pl index dfa3fb0d..f1b57f13 100755 --- a/ginac/function.pl +++ b/ginac/function.pl @@ -169,7 +169,7 @@ $interface=< #endif // def __CINT__ -#include +#include "exprseq.h" #ifndef NO_GINAC_NAMESPACE diff --git a/ginac/ginac.h b/ginac/ginac.h index c91d06c4..491b0566 100644 --- a/ginac/ginac.h +++ b/ginac/ginac.h @@ -23,45 +23,45 @@ #ifndef __GINAC_H__ #define __GINAC_H__ -#include +#include "basic.h" -#include -#include -#include +#include "ex.h" +#include "normal.h" +#include "archive.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#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 -#include -#include -#include -#include +#include "expair.h" +#include "expairseq.h" +#include "add.h" +#include "mul.h" +#include "pseries.h" -#include -#include -#include +#include "exprseq.h" +#include "function.h" +#include "ncmul.h" -#include -#include +#include "inifcns.h" +#include "operators.h" #ifndef GINAC_BASE_ONLY -#include -#include -#include -#include -#include -#include -#include -#include +#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__ diff --git a/ginac/idx.h b/ginac/idx.h index c8a27a96..5bfa9bf1 100644 --- a/ginac/idx.h +++ b/ginac/idx.h @@ -25,8 +25,8 @@ #include //#include -#include -#include +#include "basic.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/indexed.h b/ginac/indexed.h index 5b5856e5..556f92ff 100644 --- a/ginac/indexed.h +++ b/ginac/indexed.h @@ -24,7 +24,7 @@ #define __GINAC_INDEXED_H__ #include -#include +#include "exprseq.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/inifcns.h b/ginac/inifcns.h index dfaea514..20511e28 100644 --- a/ginac/inifcns.h +++ b/ginac/inifcns.h @@ -23,8 +23,8 @@ #ifndef __GINAC_INIFCNS_H__ #define __GINAC_INIFCNS_H__ -#include -#include +#include "function.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/isospin.h b/ginac/isospin.h index 8988fef1..8bd084b5 100644 --- a/ginac/isospin.h +++ b/ginac/isospin.h @@ -24,7 +24,7 @@ #define __GINAC_ISOSPIN_H__ #include -#include +#include "indexed.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/lorentzidx.h b/ginac/lorentzidx.h index 25c91723..a0ff8d53 100644 --- a/ginac/lorentzidx.h +++ b/ginac/lorentzidx.h @@ -25,7 +25,7 @@ #include #include -#include +#include "idx.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/lortensor.h b/ginac/lortensor.h index e3cb75d0..bfeff485 100644 --- a/ginac/lortensor.h +++ b/ginac/lortensor.h @@ -25,10 +25,10 @@ #include #include -#include "config.h" #include -#include -#include +#include "config.h" +#include "indexed.h" +#include "lorentzidx.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/matrix.h b/ginac/matrix.h index 23d2a475..b78a750e 100644 --- a/ginac/matrix.h +++ b/ginac/matrix.h @@ -24,8 +24,8 @@ #define __GINAC_MATRIX_H__ #include -#include -#include +#include "basic.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/mul.h b/ginac/mul.h index b3e97084..d81d046b 100644 --- a/ginac/mul.h +++ b/ginac/mul.h @@ -23,7 +23,7 @@ #ifndef __GINAC_MUL_H__ #define __GINAC_MUL_H__ -#include +#include "expairseq.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/ncmul.h b/ginac/ncmul.h index d04af7f5..cba21283 100644 --- a/ginac/ncmul.h +++ b/ginac/ncmul.h @@ -23,7 +23,7 @@ #ifndef __GINAC_NCMUL_H__ #define __GINAC_NCMUL_H__ -#include +#include "exprseq.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/numeric.h b/ginac/numeric.h index e899666d..d99f08dc 100644 --- a/ginac/numeric.h +++ b/ginac/numeric.h @@ -24,8 +24,8 @@ #define __GINAC_NUMERIC_H__ #include -#include -#include +#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. diff --git a/ginac/power.h b/ginac/power.h index 7be32619..a0ebc29b 100644 --- a/ginac/power.h +++ b/ginac/power.h @@ -23,8 +23,8 @@ #ifndef __GINAC_POWER_H__ #define __GINAC_POWER_H__ -#include -#include +#include "basic.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/pseries.h b/ginac/pseries.h index 0fd99890..aed1e99a 100644 --- a/ginac/pseries.h +++ b/ginac/pseries.h @@ -23,8 +23,8 @@ #ifndef __GINAC_SERIES_H__ #define __GINAC_SERIES_H__ -#include -#include +#include "basic.h" +#include "expairseq.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/relational.h b/ginac/relational.h index 39b44fb8..a41831e8 100644 --- a/ginac/relational.h +++ b/ginac/relational.h @@ -23,8 +23,8 @@ #ifndef __GINAC_RELATIONAL_H__ #define __GINAC_RELATIONAL_H__ -#include -#include +#include "basic.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/simp_lor.h b/ginac/simp_lor.h index 5fa9446a..28857993 100644 --- a/ginac/simp_lor.h +++ b/ginac/simp_lor.h @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include "indexed.h" +#include "lorentzidx.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/structure.h b/ginac/structure.h index 6eae9135..1e1bed02 100644 --- a/ginac/structure.h +++ b/ginac/structure.h @@ -23,7 +23,7 @@ #ifndef __GINAC_STRUCTURE_H__ #define __GINAC_STRUCTURE_H__ -#include +#include "basic.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/structure.pl b/ginac/structure.pl index 206a24cc..223b8c70 100755 --- a/ginac/structure.pl +++ b/ginac/structure.pl @@ -148,7 +148,7 @@ ${input_structure} #ifndef __GINAC_${STRUCTURE_UC}_H__ #define __GINAC_${STRUCTURE_UC}_H__ -#include +#include "structure.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginac/symbol.h b/ginac/symbol.h index 1329054d..d9fab6a3 100644 --- a/ginac/symbol.h +++ b/ginac/symbol.h @@ -24,8 +24,8 @@ #define __GINAC_SYMBOL_H__ #include -#include -#include +#include "basic.h" +#include "ex.h" #ifndef NO_GINAC_NAMESPACE namespace GiNaC { diff --git a/ginsh/Makefile.am b/ginsh/Makefile.am index 3f514141..0c3479b0 100644 --- 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) +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 diff --git a/ginsh/Makefile.in b/ginsh/Makefile.in index 7413d550..bb1c9d77 100644 --- 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) +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 diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h index 351e476e..735d4b96 100644 --- a/ginsh/ginsh.h +++ b/ginsh/ginsh.h @@ -41,7 +41,7 @@ extern "C" { } #endif -#include +#include "ginac.h" #ifndef NO_GINAC_NAMESPACE using namespace GiNaC; diff --git a/tools/Makefile.am b/tools/Makefile.am index 6c0939f8..6fbf00a8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -3,5 +3,6 @@ bin_PROGRAMS = viewgar viewgar_SOURCES = viewgar.cpp viewgar_LDADD = ../ginac/libginac.la +INCLUDES = -I$(srcdir)/../ginac man_MANS = viewgar.1 EXTRA_DIST = $(man_MANS) diff --git a/tools/Makefile.in b/tools/Makefile.in index 80ccb43b..88364a6a 100644 --- 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 +INCLUDES = -I$(srcdir)/../ginac man_MANS = viewgar.1 EXTRA_DIST = $(man_MANS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tools/viewgar.cpp b/tools/viewgar.cpp index 79f99291..6fc8c23a 100644 --- a/tools/viewgar.cpp +++ b/tools/viewgar.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include "ginac.h" using namespace GiNaC; int main(int argc, char **argv) -- 2.45.0