Clean up global variable names.

5 files changed, 10 insertions, 10 deletions

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)