diff options
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 40 | ||||
| -rw-r--r-- | src/lisp/Makefile.in | 7 |
3 files changed, 28 insertions, 24 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 17d045af..68b90aeb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-03-27 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lib/Makefile.in: Fix DLL build on Cygwin. + * lisp/Makefile.in: Adjust. + 2008-03-26 Gregory Vanuxem <g.vanuxem@wanadoo.fr> Alfredo Portes <doyenatccny@gmail.com> diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index adc4657a..13897466 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -43,59 +43,59 @@ graphics_SOURCES = \ XShade.c \ XSpadFill.c -libspad_la_SOURCES = $(foreach comp, \ +libspad_SOURCES = $(foreach comp, \ $(addsuffix _SOURCES, @axiom_c_runtime@), \ $($(comp))) unused_SOURCES = emupty.c -libopen_axiom_core_la_SOURCES = $(core_SOURCES) -libopen_axiom_core_la_objects = $(libopen_axiom_core_la_SOURCES:.c=.lo) -libspad_la_objects = $(libspad_la_SOURCES:.c=.lo) +libopen_axiom_core_SOURCES = $(core_SOURCES) +libopen_axiom_core_objects = $(libopen_axiom_core_SOURCES:.c=.$(OBJEXT)) +libspad_objects = $(libspad_SOURCES:.c=.$(OBJEXT)) subdir = src/lib/ .PHONY: all all-lib .SUFFIXES: -.SUFFIXES: .o .lo .obj .c .h +.SUFFIXES: .o .lib .obj .c .h all: all-ax all-ax all-lib: stamp stamp: $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) \ - libopen-axiom-core.$(LIBEXT) libspad.la + libopen-axiom-core.$(LIBEXT) libspad.$(LIBEXT) rm -f stamp $(STAMP) stamp $(axiom_target_libdir)/libopen-axiom-core$(SHREXT): \ - $(libopen_axiom_core_la_objects) + $(libopen_axiom_core_objects) $(mkinstalldirs) $(axiom_target_libdir) - $(LIBTOOL) --mode=link $(CC) -shared -module -o $@ \ - $(libopen_axiom_core_la_objects) @axiom_c_runtime_extra@ -lm + $(CC) -shared -o $@ $(libopen_axiom_core_objects) \ + @axiom_c_runtime_extra@ -lm -libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_la_objects) +libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_objects) $(LIBTOOL) --mode=link $(CC) -static -o $@ \ - $(libopen_axiom_core_la_objects) @axiom_c_runtime_extra@ -lm + $(libopen_axiom_core_objects) @axiom_c_runtime_extra@ -lm -libspad.la: $(libspad_la_objects) - $(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects) +libspad.$(LIBEXT): $(libspad_objects) + $(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_objects) -.PRECIOUS: %.$(OBJEXT) %.lo +.PRECIOUS: %.$(OBJEXT) -%.lo: %.c $(axiom_c_macros_h) - $(COMPILE) -o $@ $(CCF) -DOPENAXIOM_BUILD_DLL \ +%.$(OBJEXT): %.c $(axiom_c_macros_h) + $(COMPILE) -prefer-pic -o $@ $(CCF) -DOPENAXIOM_BUILD_DLL \ $(axiom_includes) $(AXIOM_X11_CFLAGS) $< # This is a support library, so it does not change often and # we don't need to remove the produced objects in mostlyclean. # The remoal is done by clean. mostlyclean-local: - @rm -f *.lo *.$(OBJEXT) + @rm -f *.$(OBJEXT) clean-local: mostlyclean-local - @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) - @$(LIBTOOL) --mode=clean libopen-axiom-core$(LIBEXT) - @$(LIBTOOL) --mode=clean libspad.la + @rm -f $(axiom_target_libdir)/libopen-axiom-core$(SHREXT) + @rm -f libopen-axiom-core$(LIBEXT) + @rm -f libspad.$(LIBEXT) @rm -fr .libs _libs @rm -f stamp diff --git a/src/lisp/Makefile.in b/src/lisp/Makefile.in index 7d05550f..2a56b978 100644 --- a/src/lisp/Makefile.in +++ b/src/lisp/Makefile.in @@ -47,7 +47,6 @@ build_libdir = ./$(top_builddir)/src/lib ## instruct GCL to use Libtool on Windows. GCL_LTCC = $(if $(findstring mingw, $(target)),"","$(LIBTOOL) --mode=compile ") GCL_LTLD = $(if $(findstring mingw, $(target)),"","$(LIBTOOL) --mode=link ") -COBJEXT = $(if $(findstring mingw, $(target)),$(OBJEXT),lo) ## Again, ideally, we would like GCL to link with the compiled Lisp ## code from core.lisp. However, the general interface compiler::link @@ -71,9 +70,9 @@ stamp: $(OUT)/lisp$(EXEEXT) ## as they must be present in the final interpreter ## and image. lisp_c_objects = \ - $(build_libdir)/bsdsignal.$(COBJEXT) \ - $(build_libdir)/cfuns-c.$(COBJEXT) \ - $(build_libdir)/sockio-c.$(COBJEXT) + $(build_libdir)/bsdsignal.$(OBJEXT) \ + $(build_libdir)/cfuns-c.$(OBJEXT) \ + $(build_libdir)/sockio-c.$(OBJEXT) $(OUT)/lisp$(EXEEXT): base-lisp$(EXEEXT) ifeq (@axiom_lisp_flavor@,gcl) |