diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-08-15 04:51:44 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-08-15 04:51:44 +0000 |
| commit | a88f78e5d08f790f8be05e4fddbb99748f908630 (patch) | |
| tree | 2f76a24fb770bbd376f17ed0386e7c6ec8e7e0ae /src | |
| parent | d7cc951908ac7f74318a08ed7f2e64768b971f00 (diff) | |
| download | open-axiom-a88f78e5d08f790f8be05e4fddbb99748f908630.tar.gz | |
* config/var-def.mk (CPPFLAGS): New expanded variable.
(LDFLAGS): Likewise.
(COMPILE): Include CPPFLAGS.
(CXXCOMPILE): Likewise.
(LINK): Include LDFLAGS.
(CXXLINK): Likewise.
(CXXLINK_SHRLIB): New.
* config/open-axiom.m4 (OPENAXIOM_HOST_DATA_PROPERTIES): Move
ABI flags setting to OPENAXIOM_HOST_COMPILERS. The CPPFLAGS and
LDFLAGS instead of CFLAGS and CXXFLAGS.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a0b81b5c..8235e3d8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2010-08-14 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lib/Makefile.in (libopen-axiom-core.$(LIBEXT)): Use LINK. + (libspad.$(LIBEXT)): Likewise. + (%.$(OBJEXT) %.lo): Honor CFLAGS. + 2010-08-08 Gabriel Dos Reis <gdr@cs.tamu.edu> * hyper/ex2ht.c (strPrefix): Be const-correct. diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index fd84b82c..353cffc6 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -91,16 +91,15 @@ $(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \ @axiom_c_runtime_extra@ -lm libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo) - $(LIBTOOL) --mode=link $(CC) -static -o $@ \ - $(libopen_axiom_core_SOURCES:.c=.lo) + $(LINK) -o $@ $(libopen_axiom_core_SOURCES:.c=.lo) libspad.$(LIBEXT): $(libspad_objects) - $(LIBTOOL) --mode=link $(CC) -static -o $@ $(libspad_objects) + $(LINK) -o $@ $(libspad_objects) .PRECIOUS: %.$(OBJEXT) %.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h) - $(COMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CCF) -g \ + $(COMPILE) $(oa_shrobj_flags) -no-suppress -o $@ $(CCF) $(CFLAGS) \ $(axiom_includes) $(AXIOM_X11_CFLAGS) $< # This is a support library, so it does not change often and |