aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2014-02-24 03:54:45 +0000
committerdos-reis <gdr@axiomatics.org>2014-02-24 03:54:45 +0000
commitd445d40c7948ab323be419569bb0e95ace3f0c25 (patch)
treebc4a304fce921095383ff4999d2eab6f8102d04f /src
parent13e5c3f6bc5954bcb6b6a76672b1ae6850385179 (diff)
downloadopen-axiom-d445d40c7948ab323be419569bb0e95ace3f0c25.tar.gz
Rename CXXCOMPILE to COMPILE and CXXLINK to LINK
Diffstat (limited to 'src')
-rw-r--r--src/clef/Makefile.in4
-rw-r--r--src/driver/Makefile.in4
-rw-r--r--src/etc/Makefile.in4
-rw-r--r--src/graph/Gdraws/Makefile.in2
-rw-r--r--src/graph/view2D/Makefile.in4
-rw-r--r--src/graph/view3D/Makefile.in4
-rw-r--r--src/graph/viewAlone/Makefile.in4
-rw-r--r--src/graph/viewman/Makefile.in4
-rw-r--r--src/hyper/Makefile.in16
-rw-r--r--src/lib/Makefile.in6
-rw-r--r--src/lisp/Makefile.in2
-rw-r--r--src/sman/Makefile.in8
-rw-r--r--src/utils/Makefile.in6
13 files changed, 34 insertions, 34 deletions
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in
index 5dc6e944..9cd432f0 100644
--- a/src/clef/Makefile.in
+++ b/src/clef/Makefile.in
@@ -58,7 +58,7 @@ stamp: $(oa_target_bindir)/clef$(EXEEXT)
$(STAMP) stamp
$(oa_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
- $(CXXLINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF}
+ $(LINK) -o $@ $(clef_objects) $(clef_LDADD) ${LDF}
.SUFFIXES:
.SUFFIXES: .c .lo .h
@@ -68,7 +68,7 @@ $(oa_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES)
$(oa_configdir)/openaxiom-c-macros.h
%.lo: %.c $(oa_c_macros_h)
- $(CXXCOMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $<
+ $(COMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $<
mostlyclean-local:
@rm -f $(clef_objects)
diff --git a/src/driver/Makefile.in b/src/driver/Makefile.in
index 97b43704..e5b1b7c4 100644
--- a/src/driver/Makefile.in
+++ b/src/driver/Makefile.in
@@ -63,14 +63,14 @@ stamp: $(bin_PROGRAMS)
.PRECIOUS: %.lo %.obj
%.lo: %.cc
- $(CXXCOMPILE) ${CXXFLAGS} -o $@ \
+ $(COMPILE) ${CXXFLAGS} -o $@ \
-DOPENAXIOM_ROOT_DIRECTORY="\"$(open_axiom_installdir)\"" \
$(oa_includes) $<
main.lo: open-axiom.h
open-axiom$(EXEEXT): $(open_axiom_objects)
- $(CXXLINK) -all-static -o $@ $(open_axiom_objects) $(open_axiom_LDADD)
+ $(LINK) -all-static -o $@ $(open_axiom_objects) $(open_axiom_LDADD)
mostlyclean-local:
@rm -f $(open_axiom_objects)
diff --git a/src/etc/Makefile.in b/src/etc/Makefile.in
index abe9a1a6..62eb07f9 100644
--- a/src/etc/Makefile.in
+++ b/src/etc/Makefile.in
@@ -105,10 +105,10 @@ $(oa_target_bindir)/asq$(EXEEXT): asq$(EXEEXT)
cp -p $< $(oa_target_bindir)
asq$(EXEEXT): $(asq_objects)
- $(CXXLINK) -o $@ $(asq_objects) $(asq_LDADD)
+ $(LINK) -o $@ $(asq_objects) $(asq_LDADD)
%.$(OBJEXT) %.lo: %.c $(oa_c_macros_h)
- $(CXXCOMPILE) $(CXXCFLAGS) $(oa_includes) -o $@ $<
+ $(COMPILE) $(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 0d872c30..22cd8b26 100644
--- a/src/graph/Gdraws/Makefile.in
+++ b/src/graph/Gdraws/Makefile.in
@@ -92,7 +92,7 @@ $(PS)/%.ps: $(srcdir)/psFiles.pamphlet
Gfun.$(OBJEXT): ${HEADERS}
Gfun.$(OBJEXT): $(builddir)/Gfun.c
- ${CXXCOMPILE} -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
+ ${COMPILE} -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
mostlyclean-local:
diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in
index 5fede732..ae087d27 100644
--- a/src/graph/view2D/Makefile.in
+++ b/src/graph/view2D/Makefile.in
@@ -74,7 +74,7 @@ stamp: $(oa_target_libdir)/view2D$(EXEEXT)
$(STAMP) stamp
$(oa_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
- $(CXXLINK) -o $@ $(view2D_objects) $(Gfun_objects) \
+ $(LINK) -o $@ $(view2D_objects) $(Gfun_objects) \
$(view2D_LDADD) $(AXIOM_X11_LDFLAGS) -lm
.PRECIOUS: %.lo
@@ -82,7 +82,7 @@ $(oa_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES)
%.$(OBJEXT): $(HEADERS)
%.lo: $(builddir)/%.c $(oa_c_macros.h)
- $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
+ $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
mostlyclean-local:
diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in
index ad1d1030..50d8fcbb 100644
--- a/src/graph/view3D/Makefile.in
+++ b/src/graph/view3D/Makefile.in
@@ -80,7 +80,7 @@ stamp: $(oa_target_libdir)/view3D$(EXEEXT)
$(STAMP) stamp
$(oa_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES)
- $(CXXLINK) -o $@ $(view3D_objects) $(Gfun_objects) \
+ $(LINK) -o $@ $(view3D_objects) $(Gfun_objects) \
$(view3D_LDADD) $(AXIOM_X11_LDFLAGS) -lm
.PRECIOUS: %.lo
@@ -88,7 +88,7 @@ $(oa_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES)
%.lo: $(HEADERS)
%.lo: %.c
- $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
+ $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
mostly-clean:
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in
index c3ee87fb..d87ee7d2 100644
--- a/src/graph/viewAlone/Makefile.in
+++ b/src/graph/viewAlone/Makefile.in
@@ -68,14 +68,14 @@ stamp: $(oa_target_bindir)/viewAlone$(EXEEXT)
$(oa_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \
$(viewAlone_DEPENDENCIES)
- $(CXXLINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD)
+ $(LINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD)
.PRECIOUS: %.lo
%.lo: $(HEADERS)
%.lo: %.c $(oa_c_macros_h)
- $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
+ $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
mostlyclean-local:
diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in
index 20a8ce4a..7e420909 100644
--- a/src/graph/viewman/Makefile.in
+++ b/src/graph/viewman/Makefile.in
@@ -76,10 +76,10 @@ stamp: $(oa_target_libdir)/viewman$(EXEEXT)
%.lo: $(viewman_HEADERS)
%.lo: %.c $(oa_c_macros_h)
- $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
+ $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $<
$(oa_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES)
- $(CXXLINK) -o $@ $(viewman_objects) $(viewman_LDADD)
+ $(LINK) -o $@ $(viewman_objects) $(viewman_LDADD)
mostlyclean-local:
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in
index e499e50a..2aea8849 100644
--- a/src/hyper/Makefile.in
+++ b/src/hyper/Makefile.in
@@ -141,10 +141,10 @@ distclean-local: clean-local
.PRECIOUS: %.lo %.$(OBJEXT)
%.$(OBJEXT) %.lo: %.c $(HEADERS)
- $(CXXCOMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $(AXIOM_X11_CFLAGS) -I. $<
+ $(COMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $(AXIOM_X11_CFLAGS) -I. $<
%.$(OBJEXT) %.lo: %.cc $(HEADERS)
- $(CXXCOMPILE) -o $@ $(CXXFLAGS) $(oa_includes) $(AXIOM_X11_CFLAGS) -I. $<
+ $(COMPILE) -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
@@ -165,19 +165,19 @@ ${HYPER}/pages/ht.db: all-hyper-pre $(srcdir)/pages/*.pht
@ # cp -pr "$(srcdir)"/viewports "$(oa_target_datadir)"
${OUTLIB}/htsearch$(EXEEXT): $(htsearch_objects) $(htsearch_DEPENDENCIES)
- ${CXXLINK} -o $@ $(htsearch_objects) $(htsearch_LDADD)
+ ${LINK} -o $@ $(htsearch_objects) $(htsearch_LDADD)
${OUTLIB}/ex2ht$(EXEEXT): $(ex2ht_objects) $(ex2ht_DEPENDENCIES)
- ${CXXLINK} -o $@ $(ex2ht_objects) $(ex2ht_LDADD)
+ ${LINK} -o $@ $(ex2ht_objects) $(ex2ht_LDADD)
$(OUTLIB)/htadd$(EXEEXT): $(htadd_objects) $(htadd_DEPENDENCIES)
- ${CXXLINK} -o $@ $(htadd_objects) $(htadd_LDADD)
+ ${LINK} -o $@ $(htadd_objects) $(htadd_LDADD)
${OUTLIB}/hthits$(EXEEXT): $(hthits_objects) $(hthits_DEPENDENCIES)
- ${CXXLINK} -o $@ $(hthits_objects) $(hthits_LDADD)
+ ${LINK} -o $@ $(hthits_objects) $(hthits_LDADD)
$(OUTLIB)/hypertex$(EXEEXT): $(hypertex_objects) $(hypertex_DEPENDENCIES)
- ${CXXLINK} -o $@ $(hypertex_objects) $(hypertex_LDADD)
+ ${LINK} -o $@ $(hypertex_objects) $(hypertex_LDADD)
${OUTLIB}/spadbuf$(EXEEXT): $(spadbuf_objects) $(spadbuf_DEPENDENCIES)
- ${CXXLINK} -o $@ $(spadbuf_objects) $(spadbuf_LDADD)
+ ${LINK} -o $@ $(spadbuf_objects) $(spadbuf_LDADD)
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 8a08c30d..8d7e563e 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -91,15 +91,15 @@ $(oa_target_libdir)/libopen-axiom-core$(SHREXT): \
@oa_c_runtime_extra@ -lm
libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo)
- $(CXXLINK) -o $@ $(libopen_axiom_core_SOURCES:.c=.lo)
+ $(LINK) -o $@ $(libopen_axiom_core_SOURCES:.c=.lo)
libspad.$(LIBEXT): $(libspad_objects)
- $(CXXLINK) -o $@ $(libspad_objects)
+ $(LINK) -o $@ $(libspad_objects)
.PRECIOUS: %.$(OBJEXT)
%.$(OBJEXT) %.lo: %.c $(oa_c_macros_h)
- $(CXXCOMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CFLAGS) \
+ $(COMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CFLAGS) \
$(oa_includes) $(AXIOM_X11_CFLAGS) $<
# This is a support library, so it does not change often and
diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in
index af1924bd..de4f1f60 100644
--- a/src/lisp/Makefile.in
+++ b/src/lisp/Makefile.in
@@ -45,7 +45,7 @@ build_libdir = ./$(top_builddir)/src/lib
## Consequently we temporarily give up here, e.g., we don't
## instruct GCL to use Libtool on Windows.
GCL_LTCC = $(if $(findstring mingw, $(target)),"","$(LIBTOOL) --tag=CC --mode=compile ")
-GCL_LTLD = $(if $(findstring mingw, $(target)),"$(CXX) $(LDFLAGS) ","$(CXXLINK) ")
+GCL_LTLD = $(if $(findstring mingw, $(target)),"$(CXX) $(LDFLAGS) ","$(LINK) ")
## Again, ideally, we would like GCL to link with the compiled Lisp
## code from core.lisp. However, the general interface compiler::link
diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in
index 7b259444..d9fe6233 100644
--- a/src/sman/Makefile.in
+++ b/src/sman/Makefile.in
@@ -87,19 +87,19 @@ stamp: $(OUTLIB)/session$(EXEEXT) \
.PRECIOUS: %.lo %.obj
%.lo: %.c
- $(CXXCOMPILE) ${CXXFLAGS} -o $@ $(oa_includes) -I$(srcdir) $<
+ $(COMPILE) ${CXXFLAGS} -o $@ $(oa_includes) -I$(srcdir) $<
${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES)
- $(CXXLINK) -o $@ $(session_objects) $(session_LDADD)
+ $(LINK) -o $@ $(session_objects) $(session_LDADD)
${OUTLIB}/spadclient$(EXEEXT): $(spadclient_objects) $(spadclient_DEPENDENCIES)
- $(CXXLINK) -o $@ $(spadclient_objects) $(spadclient_LDADD)
+ $(LINK) -o $@ $(spadclient_objects) $(spadclient_LDADD)
spadclient.$(OBJEXT): ${INC}/useproto.h ${INC}/spadclient.H1 \
$(oa_configdir)/axiom-c-macros.h
${OUT}/sman$(EXEEXT): $(sman_objects) $(sman_DEPENDENCIES)
- $(CXXLINK) -o $@ $(sman_objects) $(sman_LDADD)
+ $(LINK) -o $@ $(sman_objects) $(sman_LDADD)
$(sman_objects): sman.h $(oa_c_macros_h)
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index b0a0e504..653b3cb5 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -94,13 +94,13 @@ stamp-headers: $(libOpenAxiom_HEADERS) Makefile
$(STAMP) stamp-headers
hammer$(EXEEXT): $(hammer_OBJECTS) libOpenAxiom.$(LIBEXT)
- $(CXXLINK) -o $@ $(hammer_OBJECTS) $(hammer_LDADD) $(LDFLAGS)
+ $(LINK) -o $@ $(hammer_OBJECTS) $(hammer_LDADD) $(LDFLAGS)
libOpenAxiom.$(LIBEXT): $(libOpenAxiom_OBJECTS)
- $(CXXLINK) -o $@ $(libOpenAxiom_OBJECTS)
+ $(LINK) -o $@ $(libOpenAxiom_OBJECTS)
%.lo: %.cc stamp-headers
- $(CXXCOMPILE) ${CXXFLAGS} $(oa_include_flags) -o $@ $<
+ $(COMPILE) ${CXXFLAGS} $(oa_include_flags) -o $@ $<
mostlyclean-local: