From e74079927cf524b9dc9c8414992721c958b5a6b6 Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Tue, 29 Jan 2013 21:26:42 +0000
Subject: [PATCH] Do not use LDFLAGS per the previous commit.

Should fix issue #34.
Reported by Jasen Price.
---
 Makefile     | 6 +++---
 config.mk    | 4 ++--
 configure.sh | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 03255ce..ea8ddc5 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,13 @@ MANDIR?=$(PREFIX)/man/man1
 
 # combine all dependencies (from taglib & config.mk)
 CDEPS=$(TAGLIB_CFLAGS)  $(GSTREAMER_CFLAGS)
-LDEPS=$(TAGLIB_LDFLAGS) $(GSTREAMER_LDFLAGS)
+LDEPS=$(TAGLIB_LIBS) $(GSTREAMER_LIBS)
 ODEPS=$(GSTREAMER_OBJS)
 
 # build variables
 CC		  ?= /usr/bin/cc
 CFLAGS  += -c -std=c89 -Wall -Wextra -Wno-unused-value $(CDEBUG) $(CDEPS)
-LDFLAGS += -lm -lncurses -lutil $(LDEPS)
+LIBS    += -lm -lncurses -lutil $(LDEPS)
 
 # object files
 OBJS=commands.o compat.o e_commands.o \
@@ -33,7 +33,7 @@ VPATH = players
 # main build targets
 
 vitunes: $(OBJS)
-	$(CC) -o $@ $(LDFLAGS) $(OBJS)
+	$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
 
 .c.o:
 	$(CC) $(CFLAGS) $<
diff --git a/config.mk b/config.mk
index a971ca6..666e995 100644
--- a/config.mk
+++ b/config.mk
@@ -30,7 +30,7 @@ MANDIR = $(PREFIX)/man/man1
 ### Defaults should be fine as long as TagLib is installed.
 #######################################################################
 TAGLIB_CFLAGS  = `pkg-config taglib --cflags`
-TAGLIB_LDFLAGS = `pkg-config taglib --libs` -ltag_c
+TAGLIB_LIBS    = `pkg-config taglib --libs` -ltag_c
 
 
 #######################################################################
@@ -38,7 +38,7 @@ TAGLIB_LDFLAGS = `pkg-config taglib --libs` -ltag_c
 #######################################################################
 
 #GSTREAMER_CFLAGS  = `pkg-config gstreamer-0.10 --cflags` -DENABLE_GSTREAMER
-#GSTREAMER_LDFLAGS = `pkg-config gstreamer-0.10 --libs`   -ltag_c
+#GSTREAMER_LIBS    = `pkg-config gstreamer-0.10 --libs`   -ltag_c
 #GSTREAMER_OBJS    = gstplayer.o
 
 
diff --git a/configure.sh b/configure.sh
index e4340cd..f4c31a8 100755
--- a/configure.sh
+++ b/configure.sh
@@ -79,7 +79,7 @@ then
       TAGLIB_BLOCK="
 # taglib library detected by pkg-config
 TAGLIB_CFLAGS=\`pkg-config taglib --cflags\`
-TAGLIB_LDFLAGS=\`pkg-config taglib --libs\` -ltag_c
+TAGLIB_LIBS=\`pkg-config taglib --libs\` -ltag_c
 "
    fi
 fi
@@ -121,7 +121,7 @@ then
    GSTREAMER_BLOCK="
 # gstreamer library (${gstreamer}) detected by pkg-config
 GSTREAMER_CFLAGS  =\`pkg-config ${gstreamer} --cflags\` -DENABLE_GSTREAMER
-GSTREAMER_LDFLAGS =\`pkg-config ${gstreamer} --libs\`
+GSTREAMER_LIBS    =\`pkg-config ${gstreamer} --libs\`
 GSTREAMER_OBJS    = gstplayer.o
 "
 fi