ginac.h: include parser.hpp

diff --git a/check/Makefile.am b/check/Makefile.am
index 9b92a0b9b4919e6ea6f01232090b9b200535abaf..de86f5cddb20a35883a6abfd1d9a7280d3fdc120 100644 (file)
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -237,6 +237,6 @@ time_parser_SOURCES = time_parser.cpp \
 time_parser_LDADD = ../ginac/libginac.la
 
 
 time_parser_LDADD = ../ginac/libginac.la
 
 

-AM_CPPFLAGS = -I$(srcdir)/../ginac -I../ginac
+AM_CPPFLAGS = -I$(srcdir)/../ginac -I../ginac -DIN_GINAC

 
 CLEANFILES = exam.gar
 
 CLEANFILES = exam.gar

diff --git a/check/time_parser.cpp b/check/time_parser.cpp
index ca35fb629fcb7ee98e4ec81ddef770b30cd84fe5..273163648c6c30be360329778f5e5d1413e132d5 100644 (file)
--- a/check/time_parser.cpp
+++ b/check/time_parser.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 #include <stdexcept>
 #include "ginac.h"
 #include <vector>
 #include <stdexcept>
 #include "ginac.h"

-#include "parser/parser.hpp"

 #include "timer.h"
 extern void randomify_symbol_serials();
 using namespace std;
 #include "timer.h"
 extern void randomify_symbol_serials();
 using namespace std;

diff --git a/ginac/ginac.h b/ginac/ginac.h
index ad96e6403c057f6ee01d4f5375711a6ed343111f..2d2a9e9d5280916acaff2f55ecc99410f172d58b 100644 (file)
--- a/ginac/ginac.h
+++ b/ginac/ginac.h
@@ -70,6 +70,12 @@
 
 #include "excompiler.h"
 
 
 #include "excompiler.h"
 

+#ifndef IN_GINAC
+#include "parser.hpp"
+#else
+#include "parser/parser.hpp"
+#endif
+

 #ifdef __MAKECINT__
 #pragma link C++ nestedclass;
 #pragma link C++ nestedtypedef;
 #ifdef __MAKECINT__
 #pragma link C++ nestedclass;
 #pragma link C++ nestedtypedef;

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 52280a3f475ce916517a6ff655d42d60f2955102..824d1feb06bd7bea1bcea954b8cbedafc0588398 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,7 @@ viewgar_LDADD = ../ginac/libginac.la
 
 bin_SCRIPTS = ginac-excompiler
 
 
 bin_SCRIPTS = ginac-excompiler
 

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

 
 man_MANS = viewgar.1
 
 
 man_MANS = viewgar.1