Rename C config header.

git-svn-id: https://fricas.svn.sourceforge.net/svnroot/fricas/trunk@1473 b0c55286-4f34-0410-a049-a1e7e93b0762

ChangeLog

@@ -1,3 +1,9 @@
+2012-10-18  Waldek Hebisch  <hebisch@math.uni.wroc.pl>
+
+	* config/axiom-c-macros.h: Rename to
+	config/fricas_c_macros.h.
+	Adjust other files.
+
 2012-10-17  Waldek Hebisch  <hebisch@math.uni.wroc.pl>
 
 	* src/interp/g-boot.boot: Minor cleanup.

build-setup.sh

@@ -7,7 +7,7 @@ error() {
 
 # set -x
 
-autoheader || error "could not re-generate config/axiom-c-macros.h"
+autoheader || error "could not re-generate config/fricas_c_macros.h"
 autoconf || error "could not re-generate configure"
 
 # set +x

config/axiom-c-macros.h.in → config/fricas_c_macros.h.in

@@ -1,4 +1,4 @@
-/* config/axiom-c-macros.h.in.  Generated from configure.ac by autoheader.  */
+/* config/fricas_c_macros.h.in.  Generated from configure.ac by autoheader.  */
 
 /* BSD flavour */
 #undef BSDplatform

config/var-def.mk

@@ -123,7 +123,7 @@ fricas_build_libdir = $(fricas_builddir)/lib
 fricas_build_mandir = $(fricas_builddir)/man
 
 fricas_configdir = $(abs_top_builddir)/config
-axiom_c_macros = $(fricas_configdir)/axiom-c-macros.h
+fricas_c_macros = $(fricas_configdir)/fricas_c_macros.h
 
 LATEX = @LATEX@
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for FriCAS 2012-03-08.
+# Generated by GNU Autoconf 2.67 for FriCAS 2012-10-18.
 #
 # Report bugs to <fricas-devel@googlegroups.com>.
 #
@@ -552,8 +552,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='FriCAS'
 PACKAGE_TARNAME='fricas'
-PACKAGE_VERSION='2012-03-08'
-PACKAGE_STRING='FriCAS 2012-03-08'
+PACKAGE_VERSION='2012-10-18'
+PACKAGE_STRING='FriCAS 2012-10-18'
 PACKAGE_BUGREPORT='fricas-devel@googlegroups.com'
 PACKAGE_URL=''
 
@@ -1274,7 +1274,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures FriCAS 2012-03-08 to adapt to many kinds of systems.
+\`configure' configures FriCAS 2012-10-18 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FriCAS 2012-03-08:";;
+     short | recursive ) echo "Configuration of FriCAS 2012-10-18:";;
    esac
   cat <<\_ACEOF
 
@@ -1444,7 +1444,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FriCAS configure 2012-03-08
+FriCAS configure 2012-10-18
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1859,7 +1859,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by FriCAS $as_me 2012-03-08, which was
+It was created by FriCAS $as_me 2012-10-18, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2238,7 +2238,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-ac_config_headers="$ac_config_headers config/axiom-c-macros.h"
+ac_config_headers="$ac_config_headers config/fricas_c_macros.h"
 
 # AM_INIT_AUTOMAKE([foreign])
 
@@ -7173,7 +7173,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by FriCAS $as_me 2012-03-08, which was
+This file was extended by FriCAS $as_me 2012-10-18, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7235,7 +7235,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-FriCAS config.status 2012-03-08
+FriCAS config.status 2012-10-18
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -7358,7 +7358,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config/axiom-c-macros.h") CONFIG_HEADERS="$CONFIG_HEADERS config/axiom-c-macros.h" ;;
+    "config/fricas_c_macros.h") CONFIG_HEADERS="$CONFIG_HEADERS config/fricas_c_macros.h" ;;
     "src/clef/Makefile") CONFIG_FILES="$CONFIG_FILES src/clef/Makefile:config/var-def.mk:src/clef/Makefile.in:config/setup-dep.mk" ;;
     "src/sman/Makefile") CONFIG_FILES="$CONFIG_FILES src/sman/Makefile:config/var-def.mk:src/sman/Makefile.in:config/setup-dep.mk" ;;
     "src/graph/Makefile") CONFIG_FILES="$CONFIG_FILES src/graph/Makefile:config/var-def.mk:src/graph/Makefile.in:config/setup-dep.mk" ;;

configure.ac

@@ -1,10 +1,10 @@
 sinclude(config/fricas.m4)
-AC_INIT([FriCAS], [2012-03-08],
+AC_INIT([FriCAS], [2012-10-18],
         [fricas-devel@googlegroups.com])
 
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
-AC_CONFIG_HEADERS([config/axiom-c-macros.h])
+AC_CONFIG_HEADERS([config/fricas_c_macros.h])
 # AM_INIT_AUTOMAKE([foreign])
 AC_PREREQ([2.59])
 

src/clef/Makefile.in

@@ -31,10 +31,9 @@ $(fricas_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
 
 .PRECIOUS: %.$(OBJEXT)
 
-%.$(OBJEXT): ${INC}/edible.h \
-	$(fricas_configdir)/axiom-c-macros.h
+%.$(OBJEXT): ${INC}/edible.h $(fricas_c_macros)
 
-%.$(OBJEXT): $(srcdir)/%.c $(axiom_c_macros_h)
+%.$(OBJEXT): $(srcdir)/%.c
 	${CC} -c ${CCF} $(fricas_includes) -o $@ $<
 
 mostlyclean-local:

src/clef/edible.c

@@ -31,7 +31,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 
-#include "axiom-c-macros.h"
 #include "edible.h"
 #include "com.h"
 #include "bsdsignal.h"

src/etc/Makefile.in

@@ -76,7 +76,7 @@ asq_sources = asq.c
 asq_SOURCES = $(addsuffix .pamphlet, $(asq_sources))
 asq_objects = $(asq_sources:.c=.$(OBJEXT))
 
-$(fricas_target_bindir)/asq$(EXEEXT): asq.c $(axiom_c_macros_h)
+$(fricas_target_bindir)/asq$(EXEEXT): asq.c $(fricas_c_macros)
 	@echo 4 making $@ from $<
 	${CC} ${CCF} $(fricas_includes) -o $@ asq.c
 

src/graph/Gdraws/Gdraws0.h

@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define _GDRAWS0_H_ 1
 
 #include <X11/Xlib.h>
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 
 #define yes		1

src/graph/Gdraws/Makefile.in

@@ -29,7 +29,7 @@ subdir = src/graph/Gdraws/
 
 HEADERS = ${IN}/Gdraws0.h ${LINC}/G.h     ${LINC}/Gfun.H1    \
           ${GINC}/hash.h  ${GINC}/hash.H1 \
-		$(axiom_c_macros_h)
+		$(fricas_c_macros)
 
 PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps  ${PS}/draw.ps      \
          ${PS}/drawIstr.ps  ${PS}/drawarc.ps   ${PS}/drawcolor.ps \

src/graph/view2D/Makefile.in

@@ -48,7 +48,7 @@ $(fricas_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES
 
 %.$(OBJEXT): $(HEADERS)
 
-%.$(OBJEXT): $(srcdir)/%.c $(axiom_c_macros.h)
+%.$(OBJEXT): $(srcdir)/%.c $(fricas_c_macros)
 	${CC} -c $(CFLAGS) $(AXIOM_CFLAGS) -o $@ $<
 
 mostlyclean-local:

src/graph/view2D/buttons2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _BUTTONS2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <string.h>
 

src/graph/view2D/control2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _CONTROL2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <stdlib.h>
 #include <unistd.h>

src/graph/view2D/graph2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _GRAPH2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <stdio.h>
 #include <unistd.h>

src/graph/view2D/main2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _MAIN2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <string.h>
 #include <stdlib.h>

src/graph/view2D/pot2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _POT2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include "header2.h"
 

src/graph/view2D/process2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _PROCESS2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <string.h>
 #include <stdio.h>

src/graph/view2D/spadAction2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _SPADACTION2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/graph/view2D/stuff2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _STUFF2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <unistd.h>
 #include <stdlib.h>

src/graph/view2D/viewport2D.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _VIEWPORT2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/graph/view2D/write2d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _WRITE2D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/graph/view3D/Makefile.in

@@ -38,7 +38,7 @@ AXIOM_CFLAGS  = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN} \
 HEADERS = ${IN}/header.h ${IN}/globals.h \
 	${LINC}/component.h ${LINC}/view3D.h ${LINC}/tube.h \
 	${LINC}/actions.h ${LINC}/viewCommand.h \
-	${GINC}/view.h ${LINC}/G.h $(axiom_c_macros.h)
+	${GINC}/view.h ${LINC}/G.h $(fricas_c_macros)
 
 .PHONY: all all-ax all-view3D
 all: all-ax

src/graph/view3D/buttons3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _BUTTONS3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include "header.h"
 #include "cpanel.h"

src/graph/view3D/closeView3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _CLOSEVIEW3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <stdlib.h>
 #include "header.h"

src/graph/view3D/component3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _COMPONENT3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include "header.h"
 #include "draw.h"

src/graph/view3D/control3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _CONTROL3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>

src/graph/view3D/illuminate3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _ILLUMINATE3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <math.h>
 

src/graph/view3D/lightbut3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _LIGHTBUT3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include "header.h"
 #include "cpanel.h"

src/graph/view3D/lighting3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _LIGHTING3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 #include <math.h>
 #include <string.h>

src/graph/view3D/main3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _MAIN3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>

src/graph/view3D/mesh3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _MESH3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 #include <math.h>
 
 #include "header.h"

src/graph/view3D/msort3d.c

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #define _MSORT3D_C
-#include "axiom-c-macros.h"
+#include "fricas_c_macros.h"
 
 /*****************************************************
  * Mergesort routine                                 *