diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/clef/Makefile.in | 2 | ||||
| -rw-r--r-- | src/driver/Makefile.in | 2 | ||||
| -rw-r--r-- | src/graph/Gdraws/Makefile.in | 2 | ||||
| -rw-r--r-- | src/graph/view2D/Makefile.in | 2 | ||||
| -rw-r--r-- | src/graph/view3D/Makefile.in | 2 | ||||
| -rw-r--r-- | src/graph/viewAlone/Makefile.in | 2 | ||||
| -rw-r--r-- | src/graph/viewman/Makefile.in | 2 | ||||
| -rw-r--r-- | src/hyper/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 2 | ||||
| -rw-r--r-- | src/sman/Makefile.in | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in index a442fd10..51b291dc 100644 --- a/src/clef/Makefile.in +++ b/src/clef/Makefile.in @@ -68,7 +68,7 @@ $(axiom_target_bindir)/clef$(EXEEXT): $(clef_objects) $(clef_DEPENDENCIES) $(axiom_configdir)/openaxiom-c-macros.h %.lo: %.c $(axiom_c_macros_h) - $(CXXCOMPILE) -o $@ ${CCF} $(axiom_includes) $< + $(CXXCOMPILE) -o $@ $(CXXFLAGS) $(axiom_includes) $< mostlyclean-local: @rm -f $(clef_objects) diff --git a/src/driver/Makefile.in b/src/driver/Makefile.in index ae5a6282..934a16e9 100644 --- a/src/driver/Makefile.in +++ b/src/driver/Makefile.in @@ -53,7 +53,7 @@ stamp: $(bin_PROGRAMS) .PRECIOUS: %.lo %.obj %.lo: %.c - $(CXXCOMPILE) ${CCF} -o $@ \ + $(CXXCOMPILE) ${CXXFLAGS} -o $@ \ -DOPENAXIOM_ROOT_DIRECTORY="\"$(open_axiom_installdir)\"" \ $(axiom_includes) $< diff --git a/src/graph/Gdraws/Makefile.in b/src/graph/Gdraws/Makefile.in index 56d018df..b3333887 100644 --- a/src/graph/Gdraws/Makefile.in +++ b/src/graph/Gdraws/Makefile.in @@ -55,7 +55,7 @@ DOTH= $(axiom_src_srcdir)/graph/viewman # a .c file in the library subdirectory DOTC= $(axiom_src_srcdir)/lib -AXIOM_CFLAGS = ${CCF} -I${LINC} -I${GINC} -I$(srcdir) -I${HINC} \ +AXIOM_CFLAGS = ${CXXFLAGS)} -I${LINC} -I${GINC} -I$(srcdir) -I${HINC} \ $(axiom_includes) ${AXIOM_X11_CFLAGS} diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in index 4ac6ead6..698f0ca6 100644 --- a/src/graph/view2D/Makefile.in +++ b/src/graph/view2D/Makefile.in @@ -54,7 +54,7 @@ view2D_DEPENDENCIES = $(Gfun_objects) subdir = src/graph/view2D/ -AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \ +AXIOM_CFLAGS = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \ $(axiom_includes) GDRAW_OBJS = ../Gdraws/Gfun.lo diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in index 43b8b7f2..93321339 100644 --- a/src/graph/view3D/Makefile.in +++ b/src/graph/view3D/Makefile.in @@ -62,7 +62,7 @@ view3D_DEPENDENCIES = $(Gfun_objects) subdir = src/graph/view3D/ -AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN} \ +AXIOM_CFLAGS = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I${IN} \ $(axiom_includes) HEADERS = ${IN}/header.h ${IN}/globals.h \ diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in index f7b3a96e..dc8a333d 100644 --- a/src/graph/viewAlone/Makefile.in +++ b/src/graph/viewAlone/Makefile.in @@ -49,7 +49,7 @@ viewAlone_DEPENDENCIES = subdir = src/graph/viewAlone/ -AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I$(srcdir) -I${LINC} -I${GINC} \ +AXIOM_CFLAGS = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I$(srcdir) -I${LINC} -I${GINC} \ $(axiom_includes) HEADERS= $(srcdir)/viewAlone.h ${LINC}/component.h ${LINC}/view2D.h \ diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in index ad26dabb..78d74389 100644 --- a/src/graph/viewman/Makefile.in +++ b/src/graph/viewman/Makefile.in @@ -57,7 +57,7 @@ viewman_LDADD = -L$(build_libdir) -lspad $(AXIOM_X11_LDFLAGS) $(oa_c_libs) subdir = src/graph/viewman/ -AXIOM_CFLAGS = ${CCF} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \ +AXIOM_CFLAGS = ${CXXFLAGS} ${AXIOM_X11_CFLAGS} -I${LINC} -I${GINC} -I$(srcdir) \ $(axiom_includes) .PHONY: all all-ax all-viewman diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index bd5e04c2..58357a3d 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -141,7 +141,7 @@ distclean-local: clean-local .PRECIOUS: %.lo %.$(OBJEXT) %.$(OBJEXT) %.lo: %.c $(HEADERS) - $(CXXCOMPILE) -o $@ $(CFLAGS) ${CCF} $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $< + $(CXXCOMPILE) -o $@ $(CXXFLAGS) $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $< %.$(OBJEXT) %.lo: %.cc $(HEADERS) $(CXXCOMPILE) -o $@ $(CXXFLAGS) $(axiom_includes) $(AXIOM_X11_CFLAGS) -I. $< diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 5bb925e7..53027039 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -99,7 +99,7 @@ libspad.$(LIBEXT): $(libspad_objects) .PRECIOUS: %.$(OBJEXT) %.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h) - $(COMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CCF) $(CFLAGS) \ + $(COMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CFLAGS) \ $(axiom_includes) $(AXIOM_X11_CFLAGS) $< # This is a support library, so it does not change often and diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index 261f40ac..62a47657 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -81,7 +81,7 @@ stamp: $(OUTLIB)/session$(EXEEXT) \ .PRECIOUS: %.lo %.obj %.lo: %.c - $(CXXCOMPILE) ${CCF} -o $@ $(axiom_includes) -I$(srcdir) \ + $(CXXCOMPILE) ${CXXFLAGS} -o $@ $(axiom_includes) -I$(srcdir) \ -I$(top_srcdir)/src/driver $< ${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES) |