diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-11-27 21:28:37 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-11-27 21:28:37 +0000 |
| commit | 31cd499e87188ec57621f12335d4db910facdc1b (patch) | |
| tree | 711c088d7fd24bb8014396318c9ec3d7f6236d37 /src/graph | |
| parent | d9d1578c937658aea790f713ec93a486a1a92478 (diff) | |
| download | open-axiom-31cd499e87188ec57621f12335d4db910facdc1b.tar.gz | |
* etc/Makefile.in: Compile and link with a C++ compiler.
* etc/asq.c.pamphlet: Fix bogus declarations of standard
functions. Fix const-correctness for string literals.
Diffstat (limited to 'src/graph')
| -rw-r--r-- | src/graph/Gdraws/Makefile.in | 2 | ||||
| -rw-r--r-- | src/graph/view2D/Makefile.in | 4 | ||||
| -rw-r--r-- | src/graph/view3D/Makefile.in | 4 | ||||
| -rw-r--r-- | src/graph/viewAlone/Makefile.in | 4 | ||||
| -rw-r--r-- | src/graph/viewman/Makefile.in | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/graph/Gdraws/Makefile.in b/src/graph/Gdraws/Makefile.in index b3333887..77a01a46 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 - ${COMPILE} -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< + ${CXXCOMPILE} -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< mostlyclean-local: diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in index 698f0ca6..c645ceec 100644 --- a/src/graph/view2D/Makefile.in +++ b/src/graph/view2D/Makefile.in @@ -74,7 +74,7 @@ stamp: $(axiom_target_libdir)/view2D$(EXEEXT) $(STAMP) stamp $(axiom_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES) - $(LINK) -o $@ $(view2D_objects) $(Gfun_objects) \ + $(CXXLINK) -o $@ $(view2D_objects) $(Gfun_objects) \ $(view2D_LDADD) $(AXIOM_X11_LDFLAGS) -lm .PRECIOUS: %.lo @@ -82,7 +82,7 @@ $(axiom_target_libdir)/view2D$(EXEEXT): $(view2D_objects) $(view2D_DEPENDENCIES) %.$(OBJEXT): $(HEADERS) %.lo: $(builddir)/%.c $(axiom_c_macros.h) - $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< + $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< mostlyclean-local: diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in index 93321339..9111bee7 100644 --- a/src/graph/view3D/Makefile.in +++ b/src/graph/view3D/Makefile.in @@ -80,7 +80,7 @@ stamp: $(axiom_target_libdir)/view3D$(EXEEXT) $(STAMP) stamp $(axiom_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES) - $(LINK) -o $@ $(view3D_objects) $(Gfun_objects) \ + $(CXXLINK) -o $@ $(view3D_objects) $(Gfun_objects) \ $(view3D_LDADD) $(AXIOM_X11_LDFLAGS) -lm .PRECIOUS: %.lo @@ -88,7 +88,7 @@ $(axiom_target_libdir)/view3D$(EXEEXT): $(view3D_objects) $(view3D_DEPENDENCIES) %.lo: $(HEADERS) %.lo: %.c - $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< + $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< mostly-clean: diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in index dc8a333d..bc4611f5 100644 --- a/src/graph/viewAlone/Makefile.in +++ b/src/graph/viewAlone/Makefile.in @@ -68,14 +68,14 @@ stamp: $(axiom_target_bindir)/viewAlone$(EXEEXT) $(axiom_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \ $(viewAlone_DEPENDENCIES) - $(LINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD) + $(CXXLINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD) .PRECIOUS: %.lo %.lo: $(HEADERS) %.lo: %.c $(axiom_c_macros_h) - $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< + $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< mostlyclean-local: diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in index 78d74389..f1b4ac21 100644 --- a/src/graph/viewman/Makefile.in +++ b/src/graph/viewman/Makefile.in @@ -76,10 +76,10 @@ stamp: $(axiom_target_libdir)/viewman$(EXEEXT) %.lo: $(viewman_HEADERS) %.lo: %.c $(axiom_c_macros_h) - $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< + $(CXXCOMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< $(axiom_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES) - $(LINK) -o $@ $(viewman_objects) $(viewman_LDADD) + $(CXXLINK) -o $@ $(viewman_objects) $(viewman_LDADD) mostlyclean-local: |