- Extended manpage.

- Made make actually work.  :-)

diff --git a/cint/Makefile.am b/cint/Makefile.am
index 0ad1bd503d3d267a90c9859c7745b0c937c1a76d..2884e6de82f0c0971377b22ef8269ab35bd05dab 100644 (file)
--- a/cint/Makefile.am
+++ b/cint/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Process this file with automake to produce Makefile.in
 

-bin_PROGRAMS = ginaccint.bin ginaccint
+bin_PROGRAMS = ginaccint.bin
+bin_SCRIPTS = ginaccint

 noinst_LTLIBRARIES = libginac.la
 ginaccint_bin_SOURCES = ginaccint.bin.cpp dummies.cpp dummies.h
 man_MANS = ginaccint.1
 noinst_LTLIBRARIES = libginac.la
 ginaccint_bin_SOURCES = ginaccint.bin.cpp dummies.cpp dummies.h
 man_MANS = ginaccint.1

diff --git a/cint/Makefile.in b/cint/Makefile.in
index c4a8267e936cb55592a5152ab6aaaa6acf0549b7..9a43c9acb1e60e3f15822c16296823314ffbf889 100644 (file)
--- a/cint/Makefile.in
+++ b/cint/Makefile.in
@@ -104,7 +104,8 @@ TUTORIAL_TARGETS = @TUTORIAL_TARGETS@
 VERSION = @VERSION@
 YACC = @YACC@
 
 VERSION = @VERSION@
 YACC = @YACC@
 

-bin_PROGRAMS = ginaccint.bin ginaccint
+bin_PROGRAMS = ginaccint.bin
+bin_SCRIPTS = ginaccint

 noinst_LTLIBRARIES = libginac.la
 ginaccint_bin_SOURCES = ginaccint.bin.cpp dummies.cpp dummies.h
 man_MANS = ginaccint.1
 noinst_LTLIBRARIES = libginac.la
 ginaccint_bin_SOURCES = ginaccint.bin.cpp dummies.cpp dummies.h
 man_MANS = ginaccint.1


@@ -130,11 +131,8 @@ ginaccint_bin_OBJECTS =  ginaccint.bin.o dummies.o
 ginaccint_bin_LDADD = $(LDADD)
 ginaccint_bin_DEPENDENCIES = 
 ginaccint_bin_LDFLAGS = 
 ginaccint_bin_LDADD = $(LDADD)
 ginaccint_bin_DEPENDENCIES = 
 ginaccint_bin_LDFLAGS = 

-ginaccint_SOURCES = ginaccint.c
-ginaccint_OBJECTS =  ginaccint.o
-ginaccint_LDADD = $(LDADD)
-ginaccint_DEPENDENCIES = 
-ginaccint_LDFLAGS = 
+SCRIPTS =  $(bin_SCRIPTS)
+

 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)


@@ -156,10 +154,9 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
 
 TAR = tar
 GZIP_ENV = --best

-DEP_FILES =  .deps/dummies.P .deps/ginaccint.P .deps/ginaccint.bin.P \
-.deps/libginac.la.P
-SOURCES = libginac.la.c $(ginaccint_bin_SOURCES) ginaccint.c
-OBJECTS = libginac.la.lo $(ginaccint_bin_OBJECTS) ginaccint.o
+DEP_FILES =  .deps/dummies.P .deps/ginaccint.bin.P .deps/libginac.la.P
+SOURCES = libginac.la.c $(ginaccint_bin_SOURCES)
+OBJECTS = libginac.la.lo $(ginaccint_bin_OBJECTS)

 
 all: all-redirect
 .SUFFIXES:
 
 all: all-redirect
 .SUFFIXES:


@@ -240,9 +237,24 @@ uninstall-binPROGRAMS:
          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
        done
 
          rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
        done
 

-ginaccint: $(ginaccint_OBJECTS) $(ginaccint_DEPENDENCIES)
-       @rm -f ginaccint
-       $(LINK) $(ginaccint_LDFLAGS) $(ginaccint_OBJECTS) $(ginaccint_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+       @$(NORMAL_INSTALL)
+       $(mkinstalldirs) $(DESTDIR)$(bindir)
+       @list='$(bin_SCRIPTS)'; for p in $$list; do \
+         if test -f $$p; then \
+           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+         else if test -f $(srcdir)/$$p; then \
+           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+         else :; fi; fi; \
+       done
+
+uninstall-binSCRIPTS:
+       @$(NORMAL_UNINSTALL)
+       list='$(bin_SCRIPTS)'; for p in $$list; do \
+         rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+       done

 .cpp.o:
        $(CXXCOMPILE) -c $<
 .cpp.lo:
 .cpp.o:
        $(CXXCOMPILE) -c $<
 .cpp.lo:


@@ -395,7 +407,7 @@ check-am: all-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
 check: check-am
 installcheck-am:
 installcheck: installcheck-am

-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-binSCRIPTS

 install-exec: install-exec-am
 
 install-data-am: install-man
 install-exec: install-exec-am
 
 install-data-am: install-man


@@ -404,14 +416,15 @@ install-data: install-data-am
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am

-uninstall-am: uninstall-binPROGRAMS uninstall-man
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-man

 uninstall: uninstall-am
 uninstall: uninstall-am

-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS)

 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:

-       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) \
+               $(DESTDIR)$(mandir)/man1

 
 
 mostlyclean-generic:
 
 
 mostlyclean-generic:


@@ -458,15 +471,16 @@ mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool mostlyclean-binPROGRAMS \
 distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool mostlyclean-binPROGRAMS \
 distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \

-uninstall-binPROGRAMS install-binPROGRAMS install-man1 uninstall-man1 \
-install-man uninstall-man tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+uninstall-binPROGRAMS install-binPROGRAMS uninstall-binSCRIPTS \
+install-binSCRIPTS install-man1 uninstall-man1 install-man \
+uninstall-man tags mostlyclean-tags distclean-tags clean-tags \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean

 
 
 # Build a modified library in the ginac-subdir and put it into the cint-subdir:
 
 
 # Build a modified library in the ginac-subdir and put it into the cint-subdir:

diff --git a/cint/ginaccint.1 b/cint/ginaccint.1
index 0ce268b5b009da7cfacd559a6926057e96fa0cfe..fe313d0bef633735b1fb3551074dbb1a94b9cb2e 100644 (file)
--- a/cint/ginaccint.1
+++ b/cint/ginaccint.1
@@ -16,7 +16,7 @@ with the native compiler and linked into the system.
 After startup, ginsh displays a prompt signifying that it is ready to
 accept your input. All C++ statements are valid as input, extended by
 GiNaC's numeric or symbolic expressions.  E.g.
 After startup, ginsh displays a prompt signifying that it is ready to
 accept your input. All C++ statements are valid as input, extended by
 GiNaC's numeric or symbolic expressions.  E.g.

-.BR fibonacci(24)/1104; 
+.BR fibonacci(24)/1104;

 returns a GiNaC object of class
 .BR ex,
 , which in this case represents the numeric 42.  Symbols are declared by 
 returns a GiNaC object of class
 .BR ex,
 , which in this case represents the numeric 42.  Symbols are declared by 


@@ -64,6 +64,10 @@ Returns the expression whose output was marked
 .BR "\fBOut\fP\fInum\fP" 
 as a handle.
 
 .BR "\fBOut\fP\fInum\fP" 
 as a handle.
 

+.IP "\fBLAST\fP, \fBLLAST, \fP\fBLLLAST\fP"
+Return the last, second last and third last expression, 
+respectively.
+

 .SH EXAMPLES
 .nf
 GiNaC> symbol x("x"), y("y"), z("z");
 .SH EXAMPLES
 .nf
 GiNaC> symbol x("x"), y("y"), z("z");


@@ -75,7 +79,7 @@ Out1 = -2*(1+x)^(-3)*(-2-x+x^2)+(-1+2*x)*(1+x)^(-2)
 GiNaC> s.normal();
 Out2 = (-2+x)*(1+x)^(-1)
 GiNaC> for (int i=2; i<20; i+=2) {
 GiNaC> s.normal();
 Out2 = (-2+x)*(1+x)^(-1)
 GiNaC> for (int i=2; i<20; i+=2) {

-     >     cout << "B(" << i << ") == " << bernoulli(i) << endl;
+     >     cout << "B(" << i << ")==" << bernoulli(i) << endl;

      > }
 B(2)==1/6
 B(4)==-1/30
      > }
 B(2)==1/6
 B(4)==-1/30


@@ -90,13 +94,23 @@ GiNaC> .function
 next expression can be a function definition
 GiNaC> ex EulerNumber(unsigned n)
      > {
 next expression can be a function definition
 GiNaC> ex EulerNumber(unsigned n)
      > {

-     >     symbol x;
-     >     const ex generator = pow(cosh(x),-1);
-     >     return generator.diff(x,n).subs(x==0);
+     >     symbol xi;
+     >     const ex generator = pow(cosh(xi),-1);
+     >     return generator.diff(xi,n).subs(xi==0);

      > }
 creating file /tmp/ginac26197caa
 GiNaC> EulerNumber(42);
 Out3 = -10364622733519612119397957304745185976310201
      > }
 creating file /tmp/ginac26197caa
 GiNaC> EulerNumber(42);
 Out3 = -10364622733519612119397957304745185976310201

+GiNaC> ex f = expand((x*y*z-1)*(x*y*z+3));
+GiNaC> ex g = expand((x*y*z-1)*(x*y*z-3));
+GiNaC> cout << "The GCD of " << f << " and " << g << endl
+     >      << " is " << gcd(f, g) << endl
+     >      << " so " << f/g << endl
+     >      << " is " << normal(f/g) << endl;
+The GCD of -3+2*x*z*y+x^2*z^2*y^2 and 3-4*x*z*y+x^2*z^2*y^2
+ is -1+x*z*y
+ so (-3+2*x*z*y+x^2*z^2*y^2)*(3-4*x*z*y+x^2*z^2*y^2)^(-1)
+ is (-3+x*z*y)^(-1)*(3+x*z*y)

 GiNaC> quit;
 .fi
 
 GiNaC> quit;
 .fi