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/graph | |
| 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/graph')
| -rw-r--r-- | src/graph/viewAlone/Makefile.in | 7 | ||||
| -rw-r--r-- | src/graph/viewman/Makefile.in | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/graph/viewAlone/Makefile.in b/src/graph/viewAlone/Makefile.in index a69bfd5d..f7b3a96e 100644 --- a/src/graph/viewAlone/Makefile.in +++ b/src/graph/viewAlone/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 @@ -44,7 +44,7 @@ viewAlone_SOURCES = viewAlone.c spoonComp.c spoon2D.c viewAlone_objects = $(viewAlone_SOURCES:.c=.lo) -viewAlone_LDADD = -L$(build_libdir) -lspad -lopen-axiom-core +viewAlone_LDADD = -L$(build_libdir) -lspad $(AXIOM_X11_LDFLAGS) $(oa_c_libs) viewAlone_DEPENDENCIES = subdir = src/graph/viewAlone/ @@ -68,8 +68,7 @@ stamp: $(axiom_target_bindir)/viewAlone$(EXEEXT) $(axiom_target_bindir)/viewAlone$(EXEEXT): $(viewAlone_objects) \ $(viewAlone_DEPENDENCIES) - $(LINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD) \ - $(AXIOM_X11_LDFLAGS) + $(LINK) -o $@ $(viewAlone_objects) $(viewAlone_LDADD) .PRECIOUS: %.lo diff --git a/src/graph/viewman/Makefile.in b/src/graph/viewman/Makefile.in index 7e98991f..ad26dabb 100644 --- a/src/graph/viewman/Makefile.in +++ b/src/graph/viewman/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 @@ -53,7 +53,7 @@ viewman_headers = $(srcdir)/viewman.h \ viewman_DEPENDENCIES = -viewman_LDFLAGS = -L$(build_libdir) -lspad -lopen-axiom-core +viewman_LDADD = -L$(build_libdir) -lspad $(AXIOM_X11_LDFLAGS) $(oa_c_libs) subdir = src/graph/viewman/ @@ -79,8 +79,7 @@ stamp: $(axiom_target_libdir)/viewman$(EXEEXT) $(COMPILE) -o $@ $(CFLAGS) $(AXIOM_CFLAGS) $< $(axiom_target_libdir)/viewman$(EXEEXT): $(viewman_objects) $(viewman_DEPENDENCIES) - $(LINK) -o $@ $(viewman_objects) $(viewman_LDFLAGS) \ - $(AXIOM_X11_LDFLAGS) + $(LINK) -o $@ $(viewman_objects) $(viewman_LDADD) mostlyclean-local: |