diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/sman/Makefile.in | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4bca1f6f..b1e195ea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2011-06-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + * sman/Makefile.in (oa_OpenAxiom_ldflags): New. + (spadclient_LDADD): Use it. + (sman_LDADD): Likewise. + +2011-06-25 Gabriel Dos Reis <gdr@cs.tamu.edu> + * share/algebra/libaxiom.al: Remove. * algebra/libdb.text: Likewise. diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index b37aa64d..804cb36d 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -41,6 +41,8 @@ INC= $(axiom_src_srcdir)/include build_libdir = $(top_builddir)/src/lib +oa_OpenAxiom_ldflags = $(builddir)/../utils -lOpenAxiom + bin_PROGRAMS = session$(EXEEXT) \ spadclient$(EXEEXT) \ sman$(EXEEXT) @@ -55,14 +57,14 @@ session_DEPENDENCIES = spadclient_SOURCES = spadclient.c spadclient_objects = $(spadclient_SOURCES:.c=.lo) spadclient_LDADD = \ - -L$(axiom_target_libdir)/ -lOpenAxiom \ + $(oa_OpenAxiom_ldflags) \ -L$(build_libdir) $(libspad_la) $(oa_c_libs) spadclient_DEPENDENCIES = sman_SOURCES = sman.c sman_objects = $(sman_SOURCES:.c=.lo) sman_LDADD = \ - -L$(axiom_target_libdir)/ -lOpenAxiom \ + $(oa_OpenAxiom_ldflags) \ -L$(build_libdir) $(libspad_la) $(oa_c_libs) sman_DEPENDENCIES = |