From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 16 Apr 2012 14:39:43 +0000 (-0700)
Subject: Revert "Fix DSO linking issue"
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=c43efc75c86dd48cd67f23a4d3b5132964b331b8

Revert "Fix DSO linking issue"

This reverts commit 34abd8c7de0cac8efeead7fb3848427fb944b5bd.
The author blindly posted the patch without actually testing
whether it was necessary.  It was not, because the libraries
in question were already linked against.  Thanks to John
Darrington for pointing that out.
---

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index e6aaf57daf..75ca28a713 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -73,7 +73,6 @@ src_ui_gui_psppire_LDADD = \
 	src/ui/libuicommon.la \
 	src/libpspp.la \
 	src/libpspp-core.la \
-	$(GSL_LIBS) \
 	$(GTK_LIBS) \
 	$(GTKSOURCEVIEW_LIBS) \
 	$(CAIRO_LIBS) \
diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk
index 82f9ef8075..7bf2e6fc36 100644
--- a/src/ui/terminal/automake.mk
+++ b/src/ui/terminal/automake.mk
@@ -23,7 +23,6 @@ src_ui_terminal_pspp_LDADD = \
 	src/libpspp.la \
 	src/libpspp-core.la \
 	$(CAIRO_LIBS) \
-	$(GSL_LIBS) \
 	$(NCURSES_LIBS) \
 	$(LIBREADLINE) \
 	$(GSL_LIBS)