93f3d47f02
git-svn-id: svn://svn.openwrt.org/openwrt/packages@30607 3c298f89-4303-0410-b956-a3cf2f4a3e73
58 lines
2.5 KiB
Diff
58 lines
2.5 KiB
Diff
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -91,14 +91,12 @@ LIBGNUTLS_LDFLAGS=-lgnutls
|
|
# build pianobar
|
|
ifeq (${DYNLINK},1)
|
|
pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} libpiano.so.0
|
|
- @echo " LINK $@"
|
|
- @${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \
|
|
+ ${CC} -o $@ ${PIANOBAR_OBJ} ${LDFLAGS} -lao -lpthread -lm -L. -lpiano \
|
|
${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS}
|
|
else
|
|
pianobar: ${PIANOBAR_OBJ} ${PIANOBAR_HDR} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} \
|
|
${LIBWAITRESS_HDR} ${LIBEZXML_OBJ} ${LIBEZXML_HDR}
|
|
- @echo " LINK $@"
|
|
- @${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
|
|
+ ${CC} ${CFLAGS} ${LDFLAGS} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} \
|
|
${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ} -lao -lpthread -lm \
|
|
${LIBFAAD_LDFLAGS} ${LIBMAD_LDFLAGS} ${LIBGNUTLS_LDFLAGS} -o $@
|
|
endif
|
|
@@ -107,30 +105,25 @@ endif
|
|
libpiano.so.0: ${LIBPIANO_RELOBJ} ${LIBPIANO_HDR} ${LIBWAITRESS_RELOBJ} \
|
|
${LIBWAITRESS_HDR} ${LIBEZXML_RELOBJ} ${LIBEZXML_HDR} \
|
|
${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
|
|
- @echo " LINK $@"
|
|
- @${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
|
|
+ ${CC} -shared -Wl,-soname,libpiano.so.0 ${CFLAGS} ${LDFLAGS} ${LIBGNUTLS_LDFLAGS} \
|
|
-o libpiano.so.0.0.0 ${LIBPIANO_RELOBJ} \
|
|
${LIBWAITRESS_RELOBJ} ${LIBEZXML_RELOBJ}
|
|
- @ln -s libpiano.so.0.0.0 libpiano.so.0
|
|
- @ln -s libpiano.so.0 libpiano.so
|
|
- @echo " AR libpiano.a"
|
|
- @${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
|
|
+ ln -s libpiano.so.0.0.0 libpiano.so.0
|
|
+ ln -s libpiano.so.0 libpiano.so
|
|
+ ${AR} rcs libpiano.a ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBEZXML_OBJ}
|
|
|
|
%.o: %.c
|
|
- @echo " CC $<"
|
|
- @${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
|
|
+ ${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
|
|
-I ${LIBEZXML_INCLUDE} ${LIBFAAD_CFLAGS} \
|
|
${LIBMAD_CFLAGS} ${LIBGNUTLS_CFLAGS} -c -o $@ $<
|
|
|
|
# create position independent code (for shared libraries)
|
|
%.lo: %.c
|
|
- @echo " CC $< (PIC)"
|
|
- @${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
|
|
+ ${CC} ${CFLAGS} -I ${LIBPIANO_INCLUDE} -I ${LIBWAITRESS_INCLUDE} \
|
|
-I ${LIBEZXML_INCLUDE} -c -fPIC -o $@ $<
|
|
|
|
clean:
|
|
- @echo " CLEAN"
|
|
- @${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \
|
|
+ ${RM} ${PIANOBAR_OBJ} ${LIBPIANO_OBJ} ${LIBWAITRESS_OBJ} ${LIBWAITRESS_OBJ}/test.o \
|
|
${LIBEZXML_OBJ} ${LIBPIANO_RELOBJ} ${LIBWAITRESS_RELOBJ} \
|
|
${LIBEZXML_RELOBJ} pianobar libpiano.so* libpiano.a waitress-test
|
|
|