diff options
| -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 | 3 | ||||
| -rw-r--r-- | src/graph/viewAlone/Makefile.in | 3 | ||||
| -rw-r--r-- | src/graph/viewman/Makefile.in | 3 | ||||
| -rw-r--r-- | src/hyper/Makefile.in | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.in | 13 | ||||
| -rw-r--r-- | src/sman/Makefile.in | 2 |
8 files changed, 14 insertions, 16 deletions
diff --git a/src/clef/Makefile.in b/src/clef/Makefile.in index eeda85f8..cd745337 100644 --- a/src/clef/Makefile.in +++ b/src/clef/Makefile.in @@ -41,7 +41,7 @@ clef_objects = $(clef_SOURCES:.c=.lo) build_libdir = $(top_builddir)/src/lib -clef_LDADD = $(build_libdir)/libspad.la -L$(build_libdir) -lopen-axiom-core +clef_LDADD = -L$(build_libdir) -lspad -lopen-axiom-core clef_DEPENDENCIES = diff --git a/src/graph/view2D/Makefile.in b/src/graph/view2D/Makefile.in index 423c208a..4ac6ead6 100644 --- a/src/graph/view2D/Makefile.in +++ b/src/graph/view2D/Makefile.in @@ -48,7 +48,7 @@ view2D_objects = $(view2D_SOURCES:.c=.lo) Gfun_objects = ../Gdraws/Gfun.lo -view2D_LDADD = $(build_libdir)/libspad.la -L$(build_libdir) -lopen-axiom-core +view2D_LDADD = -L$(build_libdir) -lspad -lopen-axiom-core view2D_DEPENDENCIES = $(Gfun_objects) diff --git a/src/graph/view3D/Makefile.in b/src/graph/view3D/Makefile.in index d8c4fe79..43b8b7f2 100644 --- a/src/graph/view3D/Makefile.in +++ b/src/graph/view3D/Makefile.in @@ -57,8 +57,7 @@ view3D_objects = $(addprefix $(builddir)/, $(view3D_SOURCES:.c=.lo)) Gfun_objects = ../Gdraws/Gfun.lo -view3D_LDADD = $(build_libdir)/libspad.la \ - -L$(build_libdir) -lopen-axiom-core +view3D_LDADD = -L$(build_libdir) -lspad -lopen-axiom-core view3D_DEPENDENCIES = $(Gfun_objects) subdir = src/graph/view3D/ diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in index 707f4507..a69bfd5d 100644 --- a/src/graph/viewAlone/Makefile.in +++ b/src/graph/viewAlone/Makefile.in @@ -44,8 +44,7 @@ viewAlone_SOURCES = viewAlone.c spoonComp.c spoon2D.c viewAlone_objects = $(viewAlone_SOURCES:.c=.lo) -viewAlone_LDADD = $(build_libdir)/libspad.la \ - -L$(build_libdir) -lopen-axiom-core +viewAlone_LDADD = -L$(build_libdir) -lspad -lopen-axiom-core viewAlone_DEPENDENCIES = subdir = src/graph/viewAlone/ diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in index 38db35bf..7e98991f 100644 --- a/src/graph/viewman/Makefile.in +++ b/src/graph/viewman/Makefile.in @@ -53,8 +53,7 @@ viewman_headers = $(srcdir)/viewman.h \ viewman_DEPENDENCIES = -viewman_LDFLAGS = $(build_libdir)/libspad.la \ - -L$(build_libdir) -lopen-axiom-core ${LDF} +viewman_LDFLAGS = -L$(build_libdir) -lspad -lopen-axiom-core subdir = src/graph/viewman/ diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index e1847c03..078d5bfe 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -68,7 +68,7 @@ hypertex_SOURCES = addfile.c cond.c dialog.c display.c event.c extent1.c \ parse-paste.c parse-types.c ReadBitmap.c scrollbar.c \ show-types.c spadint.c titlebar.c -libspad_la = $(build_libdir)/libspad.la +libspad_la = -L$(build_libdir) -lspad hypertex_objects = $(hypertex_SOURCES:.c=.lo) hypertex_LDADD = $(libspad_la) -L$(build_libdir) -lopen-axiom-core diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 13897466..2554cbae 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -51,7 +51,7 @@ unused_SOURCES = emupty.c libopen_axiom_core_SOURCES = $(core_SOURCES) libopen_axiom_core_objects = $(libopen_axiom_core_SOURCES:.c=.$(OBJEXT)) -libspad_objects = $(libspad_SOURCES:.c=.$(OBJEXT)) +libspad_objects = $(libspad_SOURCES:.c=.lo) subdir = src/lib/ @@ -70,19 +70,20 @@ 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 -o $@ $(libopen_axiom_core_objects) \ + $(CC) -shared --export-all-symbols -o \ + $@ $(libopen_axiom_core_objects) \ @axiom_c_runtime_extra@ -lm -libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_objects) - $(LIBTOOL) --mode=link $(CC) -static -o $@ \ - $(libopen_axiom_core_objects) @axiom_c_runtime_extra@ -lm +libopen-axiom-core.$(LIBEXT): $(libopen_axiom_core_SOURCES:.c=.lo) + $(LIBTOOL) --mode=link $(CC) -o $@ \ + $(libopen_axiom_core_SOURCES:.c=.lo) libspad.$(LIBEXT): $(libspad_objects) $(LIBTOOL) --mode=link $(CC) -o $@ $(libspad_objects) .PRECIOUS: %.$(OBJEXT) -%.$(OBJEXT): %.c $(axiom_c_macros_h) +%.$(OBJEXT) %.lo: %.c $(axiom_c_macros_h) $(COMPILE) -prefer-pic -o $@ $(CCF) -DOPENAXIOM_BUILD_DLL \ $(axiom_includes) $(AXIOM_X11_CFLAGS) $< diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index 730514d6..53bb15c3 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -45,7 +45,7 @@ bin_PROGRAMS = session$(EXEEXT) \ spadclient$(EXEEXT) \ sman$(EXEEXT) -libspad_la = $(build_libdir)/libspad.la +libspad_la = $(build_libdir)/libspad.$(LIBEXT) session_SOURCES = session.c session_objects = $(session_SOURCES:.c=.lo) |