diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-16 06:20:06 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-16 06:20:06 +0000 |
| commit | 0c55ed614187758d4e0a670fc4f031d5f4ad7e4e (patch) | |
| tree | 5764bcb9aba6369b1e82e5ddec37ac44ed58f7a4 /src/hyper/Makefile.in | |
| parent | d982979c98f7a87c5ee8e5a84acc1bde09a53bf5 (diff) | |
| download | open-axiom-0c55ed614187758d4e0a670fc4f031d5f4ad7e4e.tar.gz | |
2009-09-16 Kosta Oikonomou <ko@research.att.com>
Gabriel Dos Reis <gdr@cs.tamu.edu>
* configure.ac.pamphlet: Don't insist on GNU C compiler if we
don't use GCL. Check for nsl on Solaris boxes.
* config/var-def.mk (oa_c_libs): New.
src/
2009-09-16 Kosta Oikonomou <ko@research.att.com>
Gabriel Dos Reis <gdr@cs.tamu.edu>
* graph/viewAlone/Makefile.in (viewAlone_LDADD): Include
$(AXIOM_X11_LDFLAGS) and $(oa_c_libs).
* graph/viewman/Makefile.in (viewman_LDADD): Likewise.
* hyper/Makefile.in (htadd_LDADD): Likewise.
* sman/Makefile.in (session_LDADD): Include $(oa_c_libs).
(spadclient_LDADD): Likewise.
(sman_LDADD): Likewise.
Diffstat (limited to 'src/hyper/Makefile.in')
| -rw-r--r-- | src/hyper/Makefile.in | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index 12cbc140..e9eac45c 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2008, Gabriel Dos Reis. +# Copyright (C) 2007-2009, Gabriel Dos Reis. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -75,30 +75,31 @@ hypertex_SOURCES = addfile.c cond.c dialog.c display.c event.c extent1.c \ libspad_la = -L$(build_libdir) -lspad -openaxiom_c_libs = -lopen-axiom-core @axiom_c_runtime_extra@ -lm - hypertex_objects = $(hypertex_SOURCES:.c=.$(OBJEXT)) -hypertex_LDADD = $(libspad_la) -L$(build_libdir) $(openaxiom_c_libs) +hypertex_LDADD = $(libspad_la) -L$(build_libdir) $(oa_c_libs) \ + $(AXIOM_X11_LDFLAGS) -lm hypertex_DEPENDENCIES = htadd_SOURCES = addfile.c htadd.c lex.c htadd_objects = $(htadd_SOURCES:.c=.$(OBJEXT)) -htadd_LDADD = $(libspad_la) -L$(build_libdir) $(openaxiom_c_libs) +htadd_LDADD = $(libspad_la) -L$(build_libdir) $(oa_c_libs) \ + $(AXIOM_X11_LDFLAGS) -lm htadd_DEPENDENCIES = spadbuf_SOURCES = spadbuf.c spadbuf_objects = $(spadbuf_SOURCES:.c=.$(OBJEXT)) -spadbuf_LDADD = $(libspad_la) -L$(build_libdir) $(openaxiom_c_libs) +spadbuf_LDADD = $(libspad_la) -L$(build_libdir) $(oa_c_libs) \ + $(AXIOM_X11_LDFLAGS) -lm spadbuf_DEPENDENCIES = hthits_SOURCES = hthits.c hthits_objects = $(hthits_SOURCES:.c=.$(OBJEXT)) -hthits_LDADD = $(libspad_la) -L$(build_libdir) $(openaxiom_c_libs) +hthits_LDADD = $(libspad_la) -L$(build_libdir) $(oa_c_libs) hthits_DEPENDENCIES = ex2ht_SOURCES = ex2ht.c ex2ht_objects = $(ex2ht_SOURCES:.c=.$(OBJEXT)) -ex2ht_LDADD = $(libspad_la) -L$(build_libdir) $(openaxiom_c_libs) +ex2ht_LDADD = $(libspad_la) -L$(build_libdir) $(oa_c_libs) ex2ht_DEPENDENCIES = subdir = src/hyper/ @@ -178,9 +179,7 @@ ${OUTLIB}/hthits$(EXEEXT): $(hthits_objects) $(hthits_DEPENDENCIES) $(OUTLIB)/hypertex$(EXEEXT): $(hypertex_objects) $(hypertex_DEPENDENCIES) - ${LINK} -o $@ $(hypertex_objects) $(hypertex_LDADD) \ - $(AXIOM_X11_LDFLAGS) -lm + ${LINK} -o $@ $(hypertex_objects) $(hypertex_LDADD) ${OUTLIB}/spadbuf$(EXEEXT): $(spadbuf_objects) $(spadbuf_DEPENDENCIES) - ${LINK} -o $@ $(spadbuf_objects) $(spadbuf_LDADD) \ - $(AXIOM_X11_LDFLAGS) -lm + ${LINK} -o $@ $(spadbuf_objects) $(spadbuf_LDADD) |