Skip to content

Commit

Permalink
Do not use LDFLAGS per the previous commit.
Browse files Browse the repository at this point in the history
Should fix issue #34.
Reported by Jasen Price.
  • Loading branch information
Tiago Cunha committed Jan 29, 2013
1 parent 8e58405 commit e740799
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -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 \
Expand All @@ -33,7 +33,7 @@ VPATH = players
# main build targets

vitunes: $(OBJS)
$(CC) -o $@ $(LDFLAGS) $(OBJS)
$(CC) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)

.c.o:
$(CC) $(CFLAGS) $<
Expand Down
4 changes: 2 additions & 2 deletions config.mk
Expand Up @@ -30,15 +30,15 @@ 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


#######################################################################
### Defaults should be fine as long as gstreamer is installed.
#######################################################################

#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


Expand Down
4 changes: 2 additions & 2 deletions configure.sh
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e740799

Please sign in to comment.