Clean up global variable names.

12 files changed, 27 insertions, 27 deletions

diff --git a/config/var-def.mk b/config/var-def.mk
index e4b90354..a52c3785 100644
--- a/config/var-def.mk
+++ b/config/var-def.mk
@@ -168,8 +168,8 @@ oa_build_docdir = $(oa_builddir)/doc
 oa_build_datadir = $(oa_builddir)/share
 oa_build_texdir = $(oa_build_datadir)/texmf/tex
 
-axiom_configdir = $(top_builddir)/config
-axiom_c_macros = $(axiom_configdir)/axiom-c-macros.h
+oa_configdir = $(top_builddir)/config
+oa_c_macros = $(oa_configdir)/axiom-c-macros.h
 
 LATEX = @LATEX@
 
@@ -204,7 +204,7 @@ oa_use_x = @oa_use_x@
 AXIOM_X11_CFLAGS = @X_CFLAGS@ 
 AXIOM_X11_LDFLAGS = @X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
 
-axiom_includes = -I$(oa_src_srcdir)/include -I$(axiom_configdir)
+oa_includes = -I$(oa_src_srcdir)/include -I$(oa_configdir)
 
 ## Where the staging build directory is found
 AXIOM = $(top_builddir)/$(target)
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index eaf7cabe..5dc6e944 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -65,10 +65,10 @@ $(oa_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
 .PRECIOUS: %.lo
 
 %.lo: ${INC}/useproto.h ${INC}/edible.h \
-	$(axiom_configdir)/openaxiom-c-macros.h
+	$(oa_configdir)/openaxiom-c-macros.h
 
-%.lo: %.c $(axiom_c_macros_h)
-	$(CXXCOMPILE) -o $@ $(CXXFLAGS) $(axiom_includes) $<
+%.lo: %.c $(oa_c_macros_h)
+	$(CXXCOMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $<
 
 mostlyclean-local:
 	@rm -f $(clef_objects)
diff --git a/src/driver/Makefile.in b/src/driver/Makefile.in
index 5f2a6676..97b43704 100644
--- a/src/driver/Makefile.in
+++ b/src/driver/Makefile.in
@@ -65,7 +65,7 @@ stamp: $(bin_PROGRAMS)
 %.lo: %.cc 
 	$(CXXCOMPILE) ${CXXFLAGS} -o $@ \
 		-DOPENAXIOM_ROOT_DIRECTORY="\"$(open_axiom_installdir)\"" \
-		$(axiom_includes) $<
+		$(oa_includes) $<
 
 main.lo: open-axiom.h
 
diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in
index 17f7407e..abe9a1a6 100644
--- a/src/etc/Makefile.in
+++ b/src/etc/Makefile.in
@@ -107,8 +107,8 @@ $(oa_target_bindir)/asq$(EXEEXT): asq$(EXEEXT)
 asq$(EXEEXT): $(asq_objects)
 	$(CXXLINK) -o $@ $(asq_objects) $(asq_LDADD)
 
-%.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h)
-	$(CXXCOMPILE) $(CXXCFLAGS) $(axiom_includes) -o $@ $<
+%.$(OBJEXT) %.lo: %.c $(oa_c_macros_h)
+	$(CXXCOMPILE) $(CXXCFLAGS) $(oa_includes) -o $@ $<
 
 
 asq.c: $(srcdir)/asq.c.pamphlet
diff --git a/src/graph/Gdraws/Makefile.in b/src/graph/Gdraws/Makefile.in
index 82a03c31..0d872c30 100644
--- a/src/graph/Gdraws/Makefile.in
+++ b/src/graph/Gdraws/Makefile.in
@@ -56,7 +56,7 @@ DOTH=	$(oa_src_srcdir)/graph/viewman
 DOTC=	$(oa_src_srcdir)/lib
 
 AXIOM_CFLAGS = ${CXXFLAGS)} -I${LINC} -I${GINC} -I$(srcdir) -I${HINC} \
-		$(axiom_includes) ${AXIOM_X11_CFLAGS}
+		$(oa_includes) ${AXIOM_X11_CFLAGS}
 
 
 subdir = src/graph/Gdraws/
@@ -64,7 +64,7 @@ subdir = src/graph/Gdraws/
 pamphlets = psFiles.pamphlet
 
 HEADERS = ${IN}/Gdraws0.h ${LINC}/G.h     ${LINC}/Gfun.H1    \
-          ${GINC}/hash.h  $(axiom_c_macros_h)
+          ${GINC}/hash.h  $(oa_c_macros_h)
 
 PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps  ${PS}/draw.ps      \
          ${PS}/drawIstr.ps  ${PS}/drawarc.ps   ${PS}/drawcolor.ps \
diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index 51d27af1..5fede732 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -55,7 +55,7 @@ view2D_DEPENDENCIES = $(Gfun_objects)
 subdir = src/graph/view2D/
 
 AXIOM_CFLAGS  = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \
-			$(axiom_includes)
+			$(oa_includes)
 
 GDRAW_OBJS = ../Gdraws/Gfun.lo
 
@@ -81,7 +81,7 @@ $(oa_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
 
 %.$(OBJEXT): $(HEADERS)
 
-%.lo: $(builddir)/%.c $(axiom_c_macros.h)
+%.lo: $(builddir)/%.c $(oa_c_macros.h)
 	$(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
 
 mostlyclean-local:
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index 73a499a6..ad1d1030 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -63,12 +63,12 @@ view3D_DEPENDENCIES = $(Gfun_objects)
 subdir = src/graph/view3D/
 
 AXIOM_CFLAGS  = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN} \
-			$(axiom_includes)
+			$(oa_includes)
 
 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 $(oa_c_macros.h)
 
 .PHONY: all all-ax all-view3D
 all: all-ax
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index fae61ed0..c3ee87fb 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -50,7 +50,7 @@ viewAlone_DEPENDENCIES =
 subdir = src/graph/viewAlone/
 
 AXIOM_CFLAGS = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I$(srcdir) -I${LINC} -I${GINC} \
-			$(axiom_includes)
+			$(oa_includes)
 
 HEADERS= $(srcdir)/viewAlone.h     ${LINC}/component.h ${LINC}/view2D.h  \
          ${LINC}/view3D.h      ${LINC}/tube.h      ${LINC}/actions.h \
@@ -74,7 +74,7 @@ $(oa_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \
 
 %.lo: $(HEADERS)
 
-%.lo: %.c $(axiom_c_macros_h)
+%.lo: %.c $(oa_c_macros_h)
 	$(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
 
 mostlyclean-local:
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index 560d86b0..20a8ce4a 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -58,7 +58,7 @@ viewman_LDADD = -L$(build_libdir) -lspad $(AXIOM_X11_LDFLAGS) $(oa_c_libs)
 subdir = src/graph/viewman/
 
 AXIOM_CFLAGS = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \
-			$(axiom_includes)
+			$(oa_includes)
 
 .PHONY: all all-ax all-viewman
 all: all-ax
@@ -75,7 +75,7 @@ stamp: $(oa_target_libdir)/viewman$(EXEEXT)
 
 %.lo: $(viewman_HEADERS)
 
-%.lo: %.c $(axiom_c_macros_h)
+%.lo: %.c $(oa_c_macros_h)
 	$(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
 
 $(oa_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES)
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in
index ea9d1971..e499e50a 100644
--- a/src/hyper/Makefile.in
+++ b/src/hyper/Makefile.in
@@ -58,7 +58,7 @@ BINFILES = $(addprefix $(OUTLIB)/,$(bin_PROGRAMS))
 HEADERS = display.h event.h extent.h node.h \
 	group.h hyper.h initx.h keyin.h lex.h \
 	parse.h parse-paste.h parse-types.h scrollbar.h \
-	titlebar.h token.h $(axiom_c_macros_h)
+	titlebar.h token.h $(oa_c_macros_h)
 
 build_libdir = $(top_builddir)/src/lib
 
@@ -141,10 +141,10 @@ distclean-local: clean-local
 .PRECIOUS: %.lo %.$(OBJEXT)
 
 %.$(OBJEXT) %.lo: %.c $(HEADERS)
-	$(CXXCOMPILE) -o $@ $(CXXFLAGS) $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $<
+	$(CXXCOMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $(AXIOM_X11_CFLAGS) -I. $<
 
 %.$(OBJEXT) %.lo: %.cc $(HEADERS)
-	$(CXXCOMPILE) -o $@ $(CXXFLAGS) $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $<
+	$(CXXCOMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $(AXIOM_X11_CFLAGS) -I. $<
 
 ${HYPER}/pages/ht.db: all-hyper-pre $(srcdir)/pages/*.pht
 	@echo making ${HYPER}/pages from $(oa_src_srcdir)/pages directory
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 0070906c..8a08c30d 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -98,9 +98,9 @@ libspad.$(LIBEXT): $(libspad_objects)
 
 .PRECIOUS: %.$(OBJEXT)
 
-%.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h)
+%.$(OBJEXT) %.lo: %.c $(oa_c_macros_h)
 	$(CXXCOMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CFLAGS) \
-		$(axiom_includes) $(AXIOM_X11_CFLAGS) $<
+		$(oa_includes) $(AXIOM_X11_CFLAGS) $<
 
 # This is a support library, so it does not change often and
 # we don't need to remove the produced objects in mostlyclean.
diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in
index 71ac4ae3..7b259444 100644
--- a/src/sman/Makefile.in
+++ b/src/sman/Makefile.in
@@ -87,7 +87,7 @@ stamp:	$(OUTLIB)/session$(EXEEXT) \
 .PRECIOUS: %.lo %.obj
 
 %.lo: %.c 
-	$(CXXCOMPILE) ${CXXFLAGS} -o $@ $(axiom_includes) -I$(srcdir) $<
+	$(CXXCOMPILE) ${CXXFLAGS} -o $@ $(oa_includes) -I$(srcdir) $<
 
 ${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES)
 	$(CXXLINK) -o $@ $(session_objects) $(session_LDADD)
@@ -96,12 +96,12 @@ ${OUTLIB}/spadclient$(EXEEXT): $(spadclient_objects) $(spadclient_DEPENDENCIES)
 	$(CXXLINK) -o $@ $(spadclient_objects) $(spadclient_LDADD)
 
 spadclient.$(OBJEXT): ${INC}/useproto.h ${INC}/spadclient.H1 \
-			$(axiom_configdir)/axiom-c-macros.h
+			$(oa_configdir)/axiom-c-macros.h
 
 ${OUT}/sman$(EXEEXT): $(sman_objects) $(sman_DEPENDENCIES)
 	$(CXXLINK) -o $@ $(sman_objects) $(sman_LDADD)
 
-$(sman_objects): sman.h $(axiom_c_macros_h)
+$(sman_objects): sman.h $(oa_c_macros_h)
 
 mostlyclean-local:
 	@rm -f $(session_objects)