Commit Diff

Commit:
3a60c27797deb05f9272733f00d59ea77ee2fb70
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
split out the various LDADD_* so we don't link everything to everything
Actions:
Patch | Tree
commit - 077802c1fe99fb1d8fc34e7ca980e9b97991c763
commit + 3a60c27797deb05f9272733f00d59ea77ee2fb70
blob - d9ca2da96350de15b9425d84e166a8276ad064df
blob + 4fbfb79eb9de18af6de28db62a0fb71b24aaa74d
--- Makefile
+++ Makefile
@@ -52,7 +52,8 @@ include Makefile.configure
 # -- targets --
 
 ${PROG}: ${OBJS}
-	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LDADD}
+	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LDADD} ${LDADD_IMSG} \
+		${LDADD_DECODERS} ${LDADD_LIB_SOCKET} ${LDADD_BACKEND}
 
 clean:
 	rm -f ${OBJS} ${OBJS:.o=.d} ${PROG}
blob - 103a329cb59ad1e055637c6f8fe491b08c0cf717
blob + cba9d33512896f76a5b4f1cac66e8bff315cc645
--- configure
+++ configure
@@ -937,9 +937,12 @@ BACKEND		 = ${BACKEND}
 CC		 = ${CC}
 CFLAGS		 = ${CFLAGS}
 CPPFLAGS	 = ${CPPFLAGS}
-LDADD		 = ${LDADD} ${LDADD_IMSG} ${LDADD_LIB_FLAC} ${LDADD_LIB_MPG123} \
-		   ${LDADD_LIB_OPUSFILE} ${LDADD_LIB_VORBISFILE} \
-		   ${LDADD_LIB_SOCKET} ${LDADD_LIB_SNDIO} ${LDADD_LIB_ASOUND}
+LDADD		 = ${LDADD}
+LDADD_IMSG	 = ${LDADD_IMSG}
+LDADD_DECODERS	 = ${LDADD_LIB_FLAC} ${LDADD_LIB_MPG123} ${LDADD_LIB_OPUSFILE} \
+			${LDADD_LIB_VORBISFILE}
+LDADD_LIB_SOCKET = ${LDADD_LIB_SOCKET}
+LDADD_BACKEND	 = ${LDADD_LIB_SNDIO} ${LDADD_LIB_ASOUND}
 LDADD_STATIC	 = ${LDADD_STATIC}
 LDFLAGS		 = ${LDFLAGS}
 STATIC		 = ${STATIC}
blob - 286db593f9ba1ddd8d77b7c0ddffd453120e48fb
blob + 7f7e25a75e6ba2fbb4307a284ca9e1a15d229cbf
--- web/Makefile
+++ web/Makefile
@@ -19,7 +19,8 @@ include ../Makefile.configure
 # --- targets ---
 
 ${PROG}: ${OBJS}
-	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LDADD}
+	${CC} -o $@ ${OBJS} ${LDFLAGS} ${LDADD} ${LDADD_IMSG} \
+		${LDADD_LIB_SOCKET}
 
 clean:
 	rm -f ${OBJS} ${OBJS:.o=.d} ${PROG}