diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/clef/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 | 13 | ||||
| -rw-r--r-- | src/sman/Makefile.in | 2 |
9 files changed, 19 insertions, 13 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eaeebd10..4fd3989d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-03-16 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * lib/Makefile.in ($(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT)): Tidy. + ($(axiom_target_libdir)/libspad.la): Likewise. + 2008-03-15 Gabriel Dos Reis <gdr@cs.tamu.edu> * include/cfuns.h (findString): Rename from include/cfuns-c.H1. diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in index 65d39a42..7e885ff5 100644 --- a/src/clef/Makefile.in +++ b/src/clef/Makefile.in @@ -40,7 +40,7 @@ clef_SOURCES = edible.c clef_objects = $(clef_SOURCES:.c=.lo) clef_LDADD = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) clef_DEPENDENCIES = diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in index cc9b80cf..e64ad57b 100644 --- a/src/graph/view2D/Makefile.in +++ b/src/graph/view2D/Makefile.in @@ -49,7 +49,7 @@ view2D_objects = $(view2D_SOURCES:.c=.lo) Gfun_objects = ../Gdraws/Gfun.lo view2D_LDADD = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) view2D_DEPENDENCIES = $(Gfun_objects) diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in index edd6a2e9..897c17c9 100644 --- a/src/graph/view3D/Makefile.in +++ b/src/graph/view3D/Makefile.in @@ -58,7 +58,7 @@ Gfun_objects = ../Gdraws/Gfun.lo view3D_LDADD = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) view3D_DEPENDENCIES = $(Gfun_objects) subdir = src/graph/view3D/ diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in index a5b12473..6f679cbe 100644 --- a/src/graph/viewAlone/Makefile.in +++ b/src/graph/viewAlone/Makefile.in @@ -45,7 +45,7 @@ viewAlone_SOURCES = viewAlone.c spoonComp.c spoon2D.c viewAlone_objects = $(viewAlone_SOURCES:.c=.lo) viewAlone_LDADD = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) viewAlone_DEPENDENCIES = subdir = src/graph/viewAlone/ diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in index 066ff0a5..2a6f8ac2 100644 --- a/src/graph/viewman/Makefile.in +++ b/src/graph/viewman/Makefile.in @@ -54,7 +54,7 @@ viewman_headers = $(srcdir)/viewman.h \ viewman_DEPENDENCIES = viewman_LDFLAGS = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) subdir = src/graph/viewman/ diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index 45f22ac1..e19fe2ab 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -69,7 +69,7 @@ hypertex_SOURCES = addfile.c cond.c dialog.c display.c event.c extent1.c \ show-types.c spadint.c titlebar.c libspad_la = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) hypertex_objects = $(hypertex_SOURCES:.c=.lo) hypertex_LDADD = $(libspad_la) diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 7c1b708d..5d2476fd 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -62,21 +62,22 @@ subdir = src/lib/ all: all-ax all-ax all-lib: stamp -stamp: $(axiom_target_libdir)/libopen-axiom-core.la \ +stamp: $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) \ $(axiom_target_libdir)/libspad.la rm -f stamp $(STAMP) stamp -$(axiom_target_libdir)/libopen-axiom-core.la: \ +$(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT): \ $(libopen_axiom_core_la_objects) $(mkinstalldirs) $(axiom_target_libdir) - $(LIBTOOL) --mode=link $(CC) -module -o $@ \ - $(libopen_axiom_core_la_objects) + $(LIBTOOL) --mode=link $(CC) -shared -o $@ \ + $(libopen_axiom_core_la_objects) @axiom_c_runtime_extra@ \ + -rpath "$(libdir)"/axiom/target/$(target)/lib $(axiom_target_libdir)/libspad.la: $(libspad_la_objects) $(mkinstalldirs) $(axiom_target_libdir) $(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_la_objects) \ - -rpath $(libdir)/axiom/target/$(target)/lib + -rpath "$(libdir)"/axiom/target/$(target)/lib .PRECIOUS: %.$(OBJEXT) %.lo @@ -91,7 +92,7 @@ mostlyclean-local: @rm -f *.lo *.$(OBJEXT) clean-local: mostlyclean-local - @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libopen-axiom-core.la + @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) @$(LIBTOOL) --mode=clean $(axiom_target_libdir)/libspad.la @rm -f $(other_objects) @rm -fr .libs _libs diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index e416807e..e395b80c 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -46,7 +46,7 @@ bin_PROGRAMS = session$(EXEEXT) \ sman$(EXEEXT) libspad_la = $(axiom_target_libdir)/libspad.la \ - $(axiom_target_libdir)/libopen-axiom-core.la + $(axiom_target_libdir)/libopen-axiom-core.$(DLLEXT) session_SOURCES = session.c session_objects = $(session_SOURCES:.c=.lo) |