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.

5 files changed, 32 insertions, 27 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c95af7a7..6df870d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2009-09-08  Anatoly Raportirenko  <ram@sunct1.jinr.ru>
 
 	* interp/boot-pkg.lisp (DFLOAT-FORMAT-GENERAL): New.
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:
 
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)
diff --git a/src/sman/Makefile.in b/src/sman/Makefile.in
index e87ff546..5e3c8ed3 100644
--- a/src/sman/Makefile.in
+++ b/src/sman/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
@@ -49,20 +49,17 @@ libspad_la = $(build_libdir)/libspad.$(LIBEXT)
 
 session_SOURCES = session.c
 session_objects = $(session_SOURCES:.c=.lo)
-session_LDADD = $(libspad_la) $(oa_c_runtime_extra) \
-		-L$(build_libdir) -lopen-axiom-core
+session_LDADD = -L$(build_libdir) $(libspad_la) $(oa_c_libs)
 session_DEPENDENCIES =
 
 spadclient_SOURCES = spadclient.c
 spadclient_objects = $(spadclient_SOURCES:.c=.lo)
-spadclient_LDADD = $(libspad_la) $(oa_c_runtime_extra) \
-			-L$(build_libdir) -lopen-axiom-core
+spadclient_LDADD =  -L$(build_libdir) $(libspad_la)  $(oa_c_libs)
 spadclient_DEPENDENCIES =
 
 sman_SOURCES = sman.c
 sman_objects = $(sman_SOURCES:.c=.lo) $(top_builddir)/src/driver/utils.lo
-sman_LDADD = $(libspad_la) $(oa_c_runtime_extra) \
-		-L$(build_libdir) -lopen-axiom-core
+sman_LDADD = -L$(build_libdir) $(libspad_la) $(oa_c_libs)
 sman_DEPENDENCIES =