diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-04-04 17:45:24 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-04-04 17:45:24 +0000 |
| commit | 9ec061da5420a937a145d846b32f26ebf077ce12 (patch) | |
| tree | 96c76c56147e213e6d82bd2dc5d53b8c637c346c /src | |
| parent | 96d20bd36c0db8aadbac6282404cf82b764545c0 (diff) | |
| download | open-axiom-9ec061da5420a937a145d846b32f26ebf077ce12.tar.gz | |
* configure.ac.pamphlet: Disable Libtool for building shared
libraries on MinGW and Cygwin.
* config/var-def.mk (SHREXT): Tidy.
(LINK_SHRLIB): New.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dd6ee975..cddbd22d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-04-04 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lib/Makefile.in (libopen_axiom_core_objects): Tidy. + 2008-04-03 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/postpar.boot (postBootNotEqual): New. Disallow `^=' in diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 419bd1c5..20668fec 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -52,7 +52,11 @@ libspad_SOURCES = $(foreach comp, \ unused_SOURCES = emupty.c libopen_axiom_core_SOURCES = $(core_SOURCES) +ifeq (@oa_use_libtool_for_shared_lib@,no) libopen_axiom_core_objects = $(libopen_axiom_core_SOURCES:.c=.$(OBJEXT)) +else +libopen_axiom_core_objects = $(libopen_axiom_core_SOURCES:.c=.lo) +endif libspad_objects = $(libspad_SOURCES:.c=.lo) subdir = src/lib/ @@ -72,8 +76,7 @@ stamp: $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) \ $(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \ $(libopen_axiom_core_objects) $(mkinstalldirs) $(axiom_target_libdir) - $(CC) -shared --export-all-symbols -o \ - $@ $(libopen_axiom_core_objects) \ + $(LINK_SHRLIB) -o $@ $(libopen_axiom_core_objects) \ @axiom_c_runtime_extra@ -lm libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo) @@ -93,11 +96,11 @@ libspad.$(LIBEXT): $(libspad_objects) # we don't need to remove the produced objects in mostlyclean. # The remoal is done by clean. mostlyclean-local: - @rm -f *.$(OBJEXT) + @rm -f *.$(OBJEXT) *.lo clean-local: mostlyclean-local @rm -f $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) - @rm -f libopen-axiom-core$(LIBEXT) + @rm -f libopen-axiom-core.$(LIBEXT) @rm -f libspad.$(LIBEXT) @rm -fr .libs _libs @rm -f stamp |