From cde40d82d8a2d5a107c53267e14292bd1c481441 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 25 Feb 2013 17:00:29 -0700 Subject: [PATCH] Rebase shared patch --- gdl-shared.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gdl-shared.patch b/gdl-shared.patch index d838156..dc75f7b 100644 --- a/gdl-shared.patch +++ b/gdl-shared.patch @@ -1,6 +1,7 @@ ---- gdl-0.9.2/src/Makefile.am.shared 2011-11-09 12:49:19.552936409 -0700 -+++ gdl-0.9.2/src/Makefile.am 2011-11-11 16:09:57.795281527 -0700 -@@ -75,7 +75,7 @@ +diff -up gdl-0.9.3/src/Makefile.am.shared gdl-0.9.3/src/Makefile.am +--- gdl-0.9.3/src/Makefile.am.shared 2012-12-27 09:22:44.000000000 -0700 ++++ gdl-0.9.3/src/Makefile.am 2013-02-25 16:59:51.886326564 -0700 +@@ -78,7 +78,7 @@ libgdl_la_SOURCES = $(cpp_hpp_files) pyt if DARWIN libgdl_la_LDFLAGS = $(all_libraries) -Wl,-m else @@ -8,4 +9,4 @@ +libgdl_la_LDFLAGS = -rpath $(libdir) $(all_libraries) -Wl,-z,muldefs endif - libgdl_la_LIBADD = -lantlr -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11 + libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11