summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2011-03-24 11:26:14 +0100
committerLars-Dominik Braun <lars@6xq.net>2011-03-24 11:27:12 +0100
commitcba53619c3a221880542713cf1dd8bf7e04e7bb3 (patch)
tree708d2c88751aadc5e81fd2e818574c054940dd46 /Makefile
parentba6c235619cffaa02332dd5eed0ef2cf73d9b245 (diff)
downloadpianobar-windows-cba53619c3a221880542713cf1dd8bf7e04e7bb3.tar.gz
pianobar-windows-cba53619c3a221880542713cf1dd8bf7e04e7bb3.tar.bz2
pianobar-windows-cba53619c3a221880542713cf1dd8bf7e04e7bb3.zip
Use c99 in posix compliant way
-lpthread and move object file to the end of the argument list.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 41cf88f..7d50ee7 100644
--- a/Makefile
+++ b/Makefile
@@ -86,20 +86,20 @@ else
LIBMAD_LDFLAGS=${LIBMAD_LIB}
endif
-PTHREAD_LIB=-pthread
+PTHREAD_LIB=-lpthread
# build pianobar
pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
${LIBWAITRESS_HDR} ${LIBEZXML_OBJ} ${LIBEZXML_HDR}
- ${CC} ${CFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
- ${LIBEZXML_OBJ} ${LIBAO_LIB} ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} \
- ${PTHREAD_LIB} ${LIBM_LIB} -o $@
+ ${CC} ${CFLAGS} ${LIBAO_LIB} ${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} \
+ ${PTHREAD_LIB} ${LIBM_LIB} -o $@ ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
+ ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
# build shared libpiano
libpiano: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR}
- ${CC} -shared ${CFLAGS} ${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} \
- ${LIBEZXML_RELOBJ} -o $@.so.0.0.0
+ ${CC} -shared ${CFLAGS} -o $@.so.0.0.0 ${LIBPIANO_RELOBJ} \
+ ${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ}
%.o: %.c
${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \