Fix global variable names in Makefiles

6 files changed, 43 insertions, 43 deletions

diff --git a/src/graph/Gdraws/Makefile.in b/src/graph/Gdraws/Makefile.in
index 77a01a46..82a03c31 100644
--- a/src/graph/Gdraws/Makefile.in
+++ b/src/graph/Gdraws/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,28 +32,28 @@
 
 
 
-IN=	$(axiom_src_srcdir)/graph/Gdraws
-OUT=	$(axiom_target_libdir)
-PS=	$(axiom_target_libdir)/graph
-DOC=    $(axiom_target_docdir)/src/graph
+IN=	$(oa_src_srcdir)/graph/Gdraws
+OUT=	$(oa_target_libdir)
+PS=	$(oa_target_libdir)/graph
+DOC=    $(oa_target_docdir)/src/graph
 
 # local include files shared by graphics
-LINC=	$(axiom_src_srcdir)/graph/include
+LINC=	$(oa_src_srcdir)/graph/include
 
 # global include files shared by everyone
-GINC=	$(axiom_src_srcdir)/include
+GINC=	$(oa_src_srcdir)/include
 
 # include files in Hyperdoc
-HINC=	$(axiom_src_srcdir)/hyper
+HINC=	$(oa_src_srcdir)/hyper
 
 # bitmaps for cursors
-BIT=	$(axiom_src_srcdir)/graph/include/bitmaps
+BIT=	$(oa_src_srcdir)/graph/include/bitmaps
 
 # a .h file stuck in a really wierd place
-DOTH=	$(axiom_src_srcdir)/graph/viewman
+DOTH=	$(oa_src_srcdir)/graph/viewman
 
 # a .c file in the library subdirectory
-DOTC=	$(axiom_src_srcdir)/lib
+DOTC=	$(oa_src_srcdir)/lib
 
 AXIOM_CFLAGS = ${CXXFLAGS)} -I${LINC} -I${GINC} -I$(srcdir) -I${HINC} \
 		$(axiom_includes) ${AXIOM_X11_CFLAGS}
@@ -79,7 +79,7 @@ PSFiles= ${PS}/colorpoly.ps ${PS}/colorwol.ps  ${PS}/draw.ps      \
 .PHONY: all all-ax all-Gdraws
 all: all-ax
 all-ax all-Gdraws: stamp
-	@ echo finished making $(axiom_src_srcdir)/Gdraws
+	@ echo finished making $(oa_src_srcdir)/Gdraws
 
 .PHONY: PSfiles.post
 stamp:  Gfun.$(OBJEXT) $(PSfiles)
@@ -87,7 +87,7 @@ stamp:  Gfun.$(OBJEXT) $(PSfiles)
 	$(STAMP) stamp
 
 $(PS)/%.ps: $(srcdir)/psFiles.pamphlet
-	$(axiom_build_document) --tangle=$* --output=$@ $<
+	$(oa_build_document) --tangle=$* --output=$@ $<
 
 Gfun.$(OBJEXT): ${HEADERS}
 
diff --git a/src/graph/Makefile.in b/src/graph/Makefile.in
index 4368c446..e816625d 100644
--- a/src/graph/Makefile.in
+++ b/src/graph/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -52,7 +52,7 @@ all-subdirs: all-subdirs.pre all-subdirs.rest
 
 .PHONY: all-PS
 all-PS: all-Gdraws $(srcdir)/PS/*.ps
-	cp -p $(srcdir)/PS/*.ps $(axiom_target_libdir)/graph/
+	cp -p $(srcdir)/PS/*.ps $(oa_target_libdir)/graph/
 
 .PHONY: all-subdirs.pre
 all-subdirs.pre:
@@ -67,7 +67,7 @@ all-subdirs.rest: all-subdirs.pre all-Gdraws all-viewman \
 all-viewman: all-Gdraws
 	cd viewman && ${MAKE}
 all-Gdraws: 
-	@$(mkdir_p) $(axiom_target_libdir)/graph
+	@$(mkdir_p) $(oa_target_libdir)/graph
 	cd Gdraws && ${MAKE}
 all-view3D: all-Gdraws
 	cd view3D && ${MAKE}
diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index c645ceec..51d27af1 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,10 +32,10 @@
 
 
 # local include files shared by graphics
-LINC=	$(axiom_src_srcdir)/graph/include
+LINC=	$(oa_src_srcdir)/graph/include
 
 # global include files shared by everyone
-GINC=	$(axiom_src_srcdir)/include
+GINC=	$(oa_src_srcdir)/include
 
 build_libdir = $(top_builddir)/src/lib
 
@@ -69,11 +69,11 @@ all: all-ax
 all-ax all-view2D: stamp
 	@ echo finished $(builddir)
 
-stamp: $(axiom_target_libdir)/view2D$(EXEEXT)
+stamp: $(oa_target_libdir)/view2D$(EXEEXT)
 	@rm -f stamp
 	$(STAMP) stamp
 
-$(axiom_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
+$(oa_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
 	$(CXXLINK) -o $@ $(view2D_objects) $(Gfun_objects) \
 	    $(view2D_LDADD) $(AXIOM_X11_LDFLAGS) -lm 
 
@@ -88,6 +88,6 @@ mostlyclean-local:
 
 clean-local: mostlyclean-local
 	@rm -f $(view2D_objects)
-	@rm -f $(axiom_target_libdir)/view2D$(EXEEXT)
+	@rm -f $(oa_target_libdir)/view2D$(EXEEXT)
 
 distclean-local: clean-local
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index 9111bee7..73a499a6 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,16 +30,16 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-IN=	$(axiom_src_srcdir)/graph/view3D
+IN=	$(oa_src_srcdir)/graph/view3D
 
 # local include files shared by graphics
-LINC=	$(axiom_src_srcdir)/graph/include
+LINC=	$(oa_src_srcdir)/graph/include
 
 # global include files shared by everyone 
-GINC=	$(axiom_src_srcdir)/include
+GINC=	$(oa_src_srcdir)/include
 
 # bitmaps for cursors
-BIT=	$(axiom_src_srcdir)/graph/include/purty
+BIT=	$(oa_src_srcdir)/graph/include/purty
 
 build_libdir = $(top_builddir)/src/lib
 
@@ -75,11 +75,11 @@ all: all-ax
 all-ax all-view3D: stamp
 	@echo finished $(srcdir)
 
-stamp: $(axiom_target_libdir)/view3D$(EXEEXT)
+stamp: $(oa_target_libdir)/view3D$(EXEEXT)
 	@rm -f stamp
 	$(STAMP) stamp
 
-$(axiom_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES)
+$(oa_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES)
 	$(CXXLINK) -o $@ $(view3D_objects) $(Gfun_objects) \
 		$(view3D_LDADD) $(AXIOM_X11_LDFLAGS) -lm
 
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index bc4611f5..fae61ed0 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,10 +31,10 @@
 
 
 # local include files shared by graphics
-LINC=	$(axiom_src_srcdir)/graph/include
+LINC=	$(oa_src_srcdir)/graph/include
 
 # global include files shared by everyone
-GINC=	$(axiom_src_srcdir)/include
+GINC=	$(oa_src_srcdir)/include
 
 build_libdir = $(top_builddir)/src/lib
 
@@ -62,11 +62,11 @@ all: all-ax
 all-ax all-viewAlone: stamp
 	@echo finished $(builddir)
 
-stamp: $(axiom_target_bindir)/viewAlone$(EXEEXT)
+stamp: $(oa_target_bindir)/viewAlone$(EXEEXT)
 	@rm -f stamp
 	$(STAMP) stamp
 
-$(axiom_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \
+$(oa_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \
 		 $(viewAlone_DEPENDENCIES)
 	$(CXXLINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD)
 
@@ -81,7 +81,7 @@ mostlyclean-local:
 
 clean-local: mostlyclean-local
 	@rm -f $(viewAlone_objects)
-	@rm -f $(axiom_target_bindir)/viewAlone$(EXEEXT)
+	@rm -f $(oa_target_bindir)/viewAlone$(EXEEXT)
 
 distclean-local: clean-local
 
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index f1b4ac21..560d86b0 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2009, Gabriel Dos Reis.
+# Copyright (C) 2007-2014, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -31,10 +31,10 @@
 
 
 # local include files shared by graphics
-LINC=	$(axiom_src_srcdir)/graph/include
+LINC=	$(oa_src_srcdir)/graph/include
 
 # global include files shared by everyone 
-GINC=	$(axiom_src_srcdir)/include
+GINC=	$(oa_src_srcdir)/include
 
 build_libdir = $(top_builddir)/src/lib
 
@@ -46,10 +46,10 @@ viewman_SOURCES = cleanup.c fun2D.c fun3D.c make2D.c make3D.c \
 viewman_objects = $(viewman_SOURCES:.c=.lo)
 
 viewman_headers = $(srcdir)/viewman.h \
-		$(addprefix $(axiom_src_srcdir)/graph/include/,\
+		$(addprefix $(oa_src_srcdir)/graph/include/,\
 			component.h view2D.h view3D.h tube.h \
 			actions.h viewCommand.h) \
-		$(axiom_src_srcdir)/include/com.h
+		$(oa_src_srcdir)/include/com.h
 
 
 viewman_DEPENDENCIES =
@@ -66,7 +66,7 @@ all: all-ax
 all-ax all-viewman: stamp
 	@ echo 30 finished $(srcdir)
 
-stamp: $(axiom_target_libdir)/viewman$(EXEEXT)
+stamp: $(oa_target_libdir)/viewman$(EXEEXT)
 	@rm -f stamp
 	$(STAMP) stamp
 
@@ -78,14 +78,14 @@ stamp: $(axiom_target_libdir)/viewman$(EXEEXT)
 %.lo: %.c $(axiom_c_macros_h)
 	$(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
 
-$(axiom_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES)
+$(oa_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES)
 	$(CXXLINK) -o $@ $(viewman_objects) $(viewman_LDADD)
 
 mostlyclean-local:
 
 clean-local: mostlyclean-local
 	@rm -f $(viewman_objects)
-	@rm -f $(axiom_target_libdir)/viewman$(EXEEXT)
+	@rm -f $(oa_target_libdir)/viewman$(EXEEXT)
 
 distclean-local: clean-local