0.84
diff --git a/ggsn/Makefile.am b/ggsn/Makefile.am
index 0e99f50..f5809a5 100644
--- a/ggsn/Makefile.am
+++ b/ggsn/Makefile.am
@@ -1,10 +1,12 @@
 bin_PROGRAMS = ggsn
 
-LDFLAGS = -lgtp -L../gtp @EXEC_LDFLAGS@
+LDFLAGS = @EXEC_LDFLAGS@
 
 CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb
 
-ggsn_LDADD = @LIBOBJS@
+ggsn_LDADD = @LIBOBJS@ -lgtp -L../gtp
+
+ggsn_DEPENDENCIES = ../gtp/libgtp.la
 
 ggsn_SOURCES = ggsn.c tun.c tun.h cmdline.c cmdline.h ippool.h ippool.c syserr.h syserr.c lookup.c
 
diff --git a/ggsn/Makefile.in b/ggsn/Makefile.in
index de98cdd..18bd591 100644
--- a/ggsn/Makefile.in
+++ b/ggsn/Makefile.in
@@ -92,11 +92,13 @@
 install_sh = @install_sh@
 bin_PROGRAMS = ggsn
 
-LDFLAGS = -lgtp -L../gtp @EXEC_LDFLAGS@
+LDFLAGS = @EXEC_LDFLAGS@
 
 CFLAGS = -O2 -D_GNU_SOURCE -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' -ggdb
 
-ggsn_LDADD = @LIBOBJS@
+ggsn_LDADD = @LIBOBJS@ -lgtp -L../gtp
+
+ggsn_DEPENDENCIES = ../gtp/libgtp.la
 
 ggsn_SOURCES = ggsn.c tun.c tun.h cmdline.c cmdline.h ippool.h ippool.c syserr.h syserr.c lookup.c
 subdir = ggsn
@@ -109,7 +111,6 @@
 am_ggsn_OBJECTS = ggsn.$(OBJEXT) tun.$(OBJEXT) cmdline.$(OBJEXT) \
 	ippool.$(OBJEXT) syserr.$(OBJEXT) lookup.$(OBJEXT)
 ggsn_OBJECTS = $(am_ggsn_OBJECTS)
-ggsn_DEPENDENCIES = @LIBOBJS@
 ggsn_LDFLAGS =
 
 DEFS = @DEFS@