diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-06-15 05:17:09 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-06-15 05:17:09 +0000 |
| commit | 7ee6862a34256d39d0e20f06c8885f49ee1ece35 (patch) | |
| tree | b8044ba9692acd8609ff7ec9a428be4963f899f0 | |
| parent | b4ff5d06336e236b895a604195cac0c14c10ee4c (diff) | |
| download | open-axiom-7ee6862a34256d39d0e20f06c8885f49ee1ece35.tar.gz | |
* sman/sman.c: utils.h no longer exists.
* sman/Makefile.in (sman_LDADD): Include OpenAxiom library.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/sman/Makefile.in | 7 | ||||
| -rw-r--r-- | src/sman/sman.c | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 34269c6f..69f49ec6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-06-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * sman/sman.c: utils.h no longer exists. + 2011-06-11 Gabriel Dos Reis <gdr@cs.tamu.edu> * scripts/document.in: Remove. diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in index f376d949..b37aa64d 100644 --- a/src/sman/Makefile.in +++ b/src/sman/Makefile.in @@ -54,7 +54,9 @@ session_DEPENDENCIES = spadclient_SOURCES = spadclient.c spadclient_objects = $(spadclient_SOURCES:.c=.lo) -spadclient_LDADD = -L$(build_libdir) $(libspad_la) $(oa_c_libs) +spadclient_LDADD = \ + -L$(axiom_target_libdir)/ -lOpenAxiom \ + -L$(build_libdir) $(libspad_la) $(oa_c_libs) spadclient_DEPENDENCIES = sman_SOURCES = sman.c @@ -83,8 +85,7 @@ stamp: $(OUTLIB)/session$(EXEEXT) \ .PRECIOUS: %.lo %.obj %.lo: %.c - $(CXXCOMPILE) ${CXXFLAGS} -o $@ $(axiom_includes) -I$(srcdir) \ - -I$(top_srcdir)/src/driver $< + $(CXXCOMPILE) ${CXXFLAGS} -o $@ $(axiom_includes) -I$(srcdir) $< ${OUTLIB}/session$(EXEEXT): $(session_objects) $(session_DEPENDENCIES) $(CXXLINK) -o $@ $(session_objects) $(session_LDADD) diff --git a/src/sman/sman.c b/src/sman/sman.c index 07f2cf64..048b7cd2 100644 --- a/src/sman/sman.c +++ b/src/sman/sman.c @@ -55,7 +55,6 @@ #include "sockio.h" #include "openpty.h" #include "cfuns.h" -#include "utils.h" using namespace OpenAxiom; |