From a919c4165b957dd55b9b1e6c8a48ae00a88e0351 Mon Sep 17 00:00:00 2001 From: Christian Bauer Date: Fri, 4 Feb 2000 18:03:55 +0000 Subject: [PATCH] - ginsh now includes "ginac.h" when compiled as part of the GiNaC package, and otherwise --- Makefile.in | 2 +- check/Makefile.in | 2 +- cint/Makefile.in | 2 +- doc/Makefile.in | 2 +- doc/reference/Makefile.in | 2 +- doc/tutorial/Makefile.in | 2 +- ginac/Makefile.in | 2 +- ginsh/Makefile.am | 1 + ginsh/Makefile.in | 4 ++-- ginsh/ginsh.h | 4 ++++ tools/Makefile.in | 2 +- 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index a61a6e74..ae1dd8db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -359,7 +359,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/check/Makefile.in b/check/Makefile.in index ce230456..01810c8e 100644 --- a/check/Makefile.in +++ b/check/Makefile.in @@ -254,7 +254,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/cint/Makefile.in b/cint/Makefile.in index 9a43c9ac..00851a0a 100644 --- a/cint/Makefile.in +++ b/cint/Makefile.in @@ -341,7 +341,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/doc/Makefile.in b/doc/Makefile.in index 6fa6eccb..7b5a3f9b 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -274,7 +274,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in index d9e81555..53ca7fa1 100644 --- a/doc/reference/Makefile.in +++ b/doc/reference/Makefile.in @@ -170,7 +170,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/doc/tutorial/Makefile.in b/doc/tutorial/Makefile.in index 16fc4f93..158a1335 100644 --- a/doc/tutorial/Makefile.in +++ b/doc/tutorial/Makefile.in @@ -327,7 +327,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/ginac/Makefile.in b/ginac/Makefile.in index e9eff67c..596304e2 100644 --- a/ginac/Makefile.in +++ b/ginac/Makefile.in @@ -295,7 +295,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/ginsh/Makefile.am b/ginsh/Makefile.am index 0c3479b0..d16cd4d3 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) +CPPFLAGS = -DIN_GINAC INCLUDES = -I$(srcdir)/../ginac man_MANS = ginsh.1 YFLAGS = -d diff --git a/ginsh/Makefile.in b/ginsh/Makefile.in index 4611377e..b33a865b 100644 --- a/ginsh/Makefile.in +++ b/ginsh/Makefile.in @@ -107,6 +107,7 @@ YACC = @YACC@ bin_PROGRAMS = ginsh ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS) +CPPFLAGS = -DIN_GINAC INCLUDES = -I$(srcdir)/../ginac man_MANS = ginsh.1 YFLAGS = -d @@ -118,7 +119,6 @@ PROGRAMS = $(bin_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I.. -CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ginsh_OBJECTS = ginsh_parser.o ginsh_lexer.o @@ -317,7 +317,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ diff --git a/ginsh/ginsh.h b/ginsh/ginsh.h index e4bb52dc..3cab8319 100644 --- a/ginsh/ginsh.h +++ b/ginsh/ginsh.h @@ -41,7 +41,11 @@ extern "C" { } #endif +#ifdef IN_GINAC #include "ginac.h" +#else +#include +#endif #ifndef NO_NAMESPACE_GINAC using namespace GiNaC; diff --git a/tools/Makefile.in b/tools/Makefile.in index a0a68002..0033fd6d 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -300,7 +300,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -- 2.44.0