r4313: *** empty log message ***

diff --git a/Makefile.in b/Makefile.in
index 2080bc26dfa6f098e87aeb14deac94142bed6cc3..a84f059607e6ba31751f3d6ef9d6cf6b66495d93 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -116,19 +117,19 @@ DIST_SUBDIRS =  man libctsupport libctsim html cgi-bin include getopt \
 libctgraphics src tools helical
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4):  configure.ac 
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac 
        cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        $(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
        cd $(srcdir) && $(AUTOCONF)
 
 config.h: stamp-h
@@ -141,7 +142,7 @@ stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
          && CONFIG_FILES= CONFIG_HEADERS=config.h \
             $(SHELL) ./config.status
        @echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
        @if test ! -f $@; then \
                rm -f $(srcdir)/stamp-h.in; \
                $(MAKE) $(srcdir)/stamp-h.in; \

diff --git a/aclocal.m4 b/aclocal.m4
index 2361d0022e0f1a54e1078ae14d7dd9e14a6e0186..131a6e2f71ddff96abbacace6cfeb8d71890ecf4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,6 +10,39 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
+# Add --enable-maintainer-mode option to configure.
+# From Jim Meyering
+
+# serial 1
+
+AC_DEFUN([AM_MAINTAINER_MODE],
+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+  dnl maintainer-mode is disabled by default
+  AC_ARG_ENABLE(maintainer-mode,
+[  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer],
+      USE_MAINTAINER_MODE=$enableval,
+      USE_MAINTAINER_MODE=no)
+  AC_MSG_RESULT($USE_MAINTAINER_MODE)
+  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
+  MAINT=$MAINTAINER_MODE_TRUE
+  AC_SUBST(MAINT)dnl
+]
+)
+
+# Define a conditional.
+
+AC_DEFUN([AM_CONDITIONAL],
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.
@@ -155,16 +188,3 @@ for am_file in <<$1>>; do
 done<<>>dnl>>)
 changequote([,]))])
 
-# Define a conditional.
-
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-

diff --git a/cgi-bin/Makefile.in b/cgi-bin/Makefile.in
index ed77dc0dbd271b3c76032f240d54abf1f031d0a2..ccc34fe29b46fb40444ab5f3ee171cc737acf94f 100644 (file)
--- a/cgi-bin/Makefile.in
+++ b/cgi-bin/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -106,7 +107,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu cgi-bin/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/configure b/configure
index 3f8f09ffc6b6a9708ab91ba2e1ee1b9971a1fc46..741059509f3a8ada9dc34b890c98d7ed7d4d6a71 100755 (executable)
--- a/configure
+++ b/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE AWK RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX wxconfig build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP INCLUDED_GETOPT_LONG_TRUE INCLUDED_GETOPT_LONG_FALSE DEBUG_TRUE DEBUG_FALSE lamdir mpienable cgibindir cgibinurl webdatadir webdataurl htmldir cgiprograms htmldata USE_HTML_TRUE USE_HTML_FALSE webenabled USE_LAM_TRUE USE_LAM_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_TOOLKIT_LIBS X_BASIC_LIBS NO_X_TRUE NO_X_FALSE my_includes HAVE_SGP_TRUE HAVE_SGP_FALSE HAVE_WXWINDOWS_TRUE HAVE_WXWINDOWS_FALSE wxcflags wxlibs ctlibs lamprograms lamdefs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE AWK RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX wxconfig build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPP EGREP INCLUDED_GETOPT_LONG_TRUE INCLUDED_GETOPT_LONG_FALSE DEBUG_TRUE DEBUG_FALSE lamdir mpienable cgibindir cgibinurl webdatadir webdataurl htmldir cgiprograms htmldata USE_HTML_TRUE USE_HTML_FALSE webenabled USE_LAM_TRUE USE_LAM_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_TOOLKIT_LIBS X_BASIC_LIBS NO_X_TRUE NO_X_FALSE my_includes HAVE_SGP_TRUE HAVE_SGP_FALSE HAVE_WXWINDOWS_TRUE HAVE_WXWINDOWS_FALSE wxcflags wxlibs ctlibs lamprograms lamdefs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -860,6 +860,8 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-maintainer-mode enable make rules and dependencies not useful
+                          (and sometimes confusing) to the casual installer
   --enable-debug          Turn on debugging
   --enable-verbose-warnings
                           Enable verbose compiler warnings.
@@ -1299,6 +1301,29 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval="$enable_maintainer_mode"
+  USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi;
+  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
 am__api_version="1.4"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -10214,6 +10239,9 @@ s,@ECHO_C@,$ECHO_C,;t t
 s,@ECHO_N@,$ECHO_N,;t t
 s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
+s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+s,@MAINT@,$MAINT,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t

diff --git a/getopt/Makefile.in b/getopt/Makefile.in
index 2b293d7d056dcd299d0688800fa1797d21499659..57d14989bcbd6d9516835c270c06864917807d8b 100644 (file)
--- a/getopt/Makefile.in
+++ b/getopt/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -128,7 +129,7 @@ OBJECTS = $(libgetopt_a_OBJECTS)
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu getopt/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/helical/Makefile.in b/helical/Makefile.in
index 8c258176c09e172e2587e166603da83aad24a7e9..f2e2cb47184b08180797408780fa409dbf1cca27 100644 (file)
--- a/helical/Makefile.in
+++ b/helical/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -103,7 +104,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu helical/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/html/Makefile.in b/html/Makefile.in
index 39acbfc149daf605b7209a04a22890977f031a3b..22f0656fb82269679dac61fa0c68487a4791fee2 100644 (file)
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -105,7 +106,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu html/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/include/Makefile.in b/include/Makefile.in
index bbde711dc23711f72886d62a918ad8e0d55dbaae..6dd71605e1dfab05733dd5eb79a0fcab29f5547c 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -105,7 +106,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/include/scanner.h b/include/scanner.h
index 09ab796ce48ed25354a88a678ffdee73db2d1411..cad4be01e951b45fc5280b6255409e83c075e0f0 100644 (file)
--- a/include/scanner.h
+++ b/include/scanner.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: scanner.h,v 1.22 2001/09/24 09:40:42 kevin Exp $
+**  $Id: scanner.h,v 1.23 2003/04/01 19:49:41 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -72,6 +72,7 @@ class Scanner
   static const int Scanner::GEOMETRY_PARALLEL;
   static const int Scanner::GEOMETRY_EQUILINEAR;
   static const int Scanner::GEOMETRY_EQUIANGULAR;
+  static const int Scanner::GEOMETRY_LINOGRAM;
 
   
   Scanner (const Phantom& phm, const char* const geometryName, int nDet, 

diff --git a/libctgraphics/Makefile.in b/libctgraphics/Makefile.in
index 5e79ce783a2ff60696b7b90427c71350868276e0..f8847d7968eca6c7412d95278d7f040091d003f6 100644 (file)
--- a/libctgraphics/Makefile.in
+++ b/libctgraphics/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -127,7 +128,7 @@ OBJECTS = $(libctgraphics_a_OBJECTS)
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cpp .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu libctgraphics/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/libctsim/Makefile.in b/libctsim/Makefile.in
index 620dc2f1a7496e1468fdb556d774079fb00b361c..7f218d54e938916e6d4026828dc9a72f2af4f41e 100644 (file)
--- a/libctsim/Makefile.in
+++ b/libctsim/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -131,7 +132,7 @@ OBJECTS = $(libctsim_a_OBJECTS)
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cpp .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu libctsim/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/libctsim/scanner.cpp b/libctsim/scanner.cpp
index 6747ea030d59da2f3a1b80876d0ea544c648c53c..57babad0c0cfa4387d512233acf3f3d88afee7fc 100644 (file)
--- a/libctsim/scanner.cpp
+++ b/libctsim/scanner.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: scanner.cpp,v 1.42 2002/06/20 08:22:48 kevin Exp $
+**  $Id: scanner.cpp,v 1.43 2003/04/01 19:49:41 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -32,12 +32,14 @@ const int Scanner::GEOMETRY_INVALID = -1;
 const int Scanner::GEOMETRY_PARALLEL = 0;
 const int Scanner::GEOMETRY_EQUIANGULAR = 1;
 const int Scanner::GEOMETRY_EQUILINEAR = 2;
+const int Scanner::GEOMETRY_LINOGRAM = 3;
 
 const char* Scanner::s_aszGeometryName[] = 
 {
   {"parallel"},
   {"equiangular"},
   {"equilinear"},
+  {"linogram"},
 };
 
 const char* Scanner::s_aszGeometryTitle[] = 
@@ -45,6 +47,7 @@ const char* Scanner::s_aszGeometryTitle[] =
   {"Parallel"},
   {"Equiangular"},
   {"Equilinear"},
+  {"Linogram"},
 };
 
 const int Scanner::s_iGeometryCount = sizeof(s_aszGeometryName) / sizeof(const char*);

diff --git a/libctsupport/Makefile.in b/libctsupport/Makefile.in
index 6af3a3220385dfd3da2b3d43937cde6f65738dde..70bd266e6a4f6f35fb8aac1f139049ca09156e2d 100644 (file)
--- a/libctsupport/Makefile.in
+++ b/libctsupport/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -130,7 +131,7 @@ OBJECTS = $(libctsupport_a_OBJECTS)
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cpp .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu libctsupport/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/man/Makefile.in b/man/Makefile.in
index 1ab7c40514fb1fa90639fc27aafdb8a5d558445d..60a9c866960a4799f319e4e5df9b090f8b10c6f8 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -108,7 +109,7 @@ TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/src/Makefile.in b/src/Makefile.in
index e941ad29bc5f0ebec5350fb6a359271c28c7cf64..404097684745ee5721fde32ba2fe9aa857c90768 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -62,6 +62,7 @@ host_triplet = @host@
 AWK = @AWK@
 CC = @CC@
 CXX = @CXX@
+MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -139,7 +140,7 @@ OBJECTS = $(ctsim_OBJECTS)
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cpp .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
        cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)

diff --git a/tools/linogram.cpp b/tools/linogram.cpp
index 16e78ad343747faade392e99942bca60d3f58460..31b3b56a8f87e17c7b607bdafbf4cc849d9bd694 100644 (file)
--- a/tools/linogram.cpp
+++ b/tools/linogram.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: linogram.cpp,v 1.2 2003/04/01 18:56:59 kevin Exp $
+**  $Id: linogram.cpp,v 1.3 2003/04/01 19:49:41 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -38,7 +38,7 @@ static struct option my_options[] =
   {0, 0, 0, 0}
 };
 
-static const char* g_szIdStr = "$Id: linogram.cpp,v 1.2 2003/04/01 18:56:59 kevin Exp $";
+static const char* g_szIdStr = "$Id: linogram.cpp,v 1.3 2003/04/01 19:49:41 kevin Exp $";
 
 
 void 
@@ -102,13 +102,28 @@ linogram_main (int argc, char *const argv[])
 
   int n = atol (in_n);
   double d = atof (in_d);
-  int size = 2 * (2 * n - 1) + 1;
-  double divisor = 4 * n + 3;
+  int size = 4 * n + 3;
+  double theta_base = PI/8;
   
-  for (int itheta = 0; itheta < size; itheta++) {
-    double theta = atan (2 * itheta / divisor);
-    printf ("%lf: ", theta);
-    double step = d * cos(theta);
+  double theta_vec [size];
+  for (int i = 0; i < size; i++) {
+    int m = i - (2 * n + 1);
+    theta_vec[i] = atan (static_cast<double>(2 * m) / size);
+  }
+
+  int m;
+  for (m = 0; m < size; m++) {
+    printf ("%lf: ", theta_vec[m] + theta_base);
+    double step = d * cos(theta_vec[m]);
+    for (int id = 0; id < size; id++) {
+      printf ("%lf ", id * step);
+    }
+    printf ("\n");
+  }
+
+  for (m = 0; m < size; m++) {
+    printf ("%lf: ", theta_vec[m] + PI/2. + theta_base);
+    double step = d * cos(theta_vec[m]);
     for (int id = 0; id < size; id++) {
       printf ("%lf ", id * step);
     }