Changeset 4980:1c0e5a348779 in roaraudio

Timestamp:

05/19/11 11:22:01 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Corrected linkage in indrect mode (pr1) (enables to build in indirect mode on Debian)

Files:

• ChangeLog (modified) (1 diff)
• roarclients/Makefile (modified) (3 diffs)
• roard/Makefile (modified) (1 diff)

ChangeLog

@@ -14 +14 @@
         * Updated libroarpulse, includes converting libroarpulse-simple to VS API.
         * Added support for OpenBSD sndio's new TCP connection syntax.
+        * Corrected linkage in indrect mode (pr1)
 
 v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST

roarclients/Makefile

@@ -69 +69 @@
         $L
 roarphone: roarphone.o
-        ${CC} ${LDFLAGS} -o roarphone roarphone.o $(LIBROARDSP) $(LIBROAREIO)
+        ${CC} ${LDFLAGS} -o roarphone roarphone.o $(LIBROARDSP) $(LIBROAREIO) $(LIBS)
 roarfilt: roarfilt.o
-        ${CC} ${LDFLAGS} -o roarfilt roarfilt.o $(LIBROARDSP)
+        ${CC} ${LDFLAGS} -o roarfilt roarfilt.o $(LIBROARDSP) $(LIBS) $(lib_m)
 roarsin: roarsin.o
-        ${CC} ${LDFLAGS} -o roarsin roarsin.o $(LIBROARDSP)
+        ${CC} ${LDFLAGS} -o roarsin roarsin.o $(LIBROARDSP) $(LIBS) $(lib_m)
 roarvumeter: roarvumeter.o
-        ${CC} ${LDFLAGS} -o roarvumeter roarvumeter.o $(LIBROAR) $(LIBROARDSP) $(lib_m)
+        ${CC} ${LDFLAGS} -o roarvumeter roarvumeter.o $(LIBS) $(LIBROARDSP) $(lib_m)
 roardtmf: roardtmf.o
-        ${CC} ${LDFLAGS} -o roardtmf roardtmf.o $(LIBROAR) $(lib_m)
+        ${CC} ${LDFLAGS} -o roardtmf roardtmf.o $(LIBS) $(lib_m)
 roarsockconnect: roarsockconnect.o
         $L
@@ -89 +89 @@
         $(LNL)
 roarvorbis: roarvorbis.o
-        ${CC} ${LDFLAGS} -o roarvorbis roarvorbis.o $(VORBISLIBS)
+        ${CC} ${LDFLAGS} -o roarvorbis roarvorbis.o $(VORBISLIBS) $(LIBS)
 roarshout: roarshout.o
-        ${CC} ${LDFLAGS} -o roarshout roarshout.o $(SHOUTLIBS)
+        ${CC} ${LDFLAGS} -o roarshout roarshout.o $(SHOUTLIBS) $(LIBS)
 polytest: polytest.o
-        ${CC} ${LDFLAGS} -o polytest polytest.o $(LIBROARDSP)
+        ${CC} ${LDFLAGS} -o polytest polytest.o $(LIBROARDSP) $(LIBS)
 roarlight: roarlight.o
-        ${CC} ${LDFLAGS} -o roarlight roarlight.o $(LIBROARLIGHT)
+        ${CC} ${LDFLAGS} -o roarlight roarlight.o $(LIBROARLIGHT) $(LIBS)
 pinentrytest: pinentrytest.o
         $L
@@ -105 +105 @@
         $L
 roarfctest: roarfctest.o
-        ${CC} ${LDFLAGS} -o roarfctest roarfctest.o $(LIBROARDSP)
+        ${CC} ${LDFLAGS} -o roarfctest roarfctest.o $(LIBROARDSP) $(LIBS) $(lib_m)
 
 roarify.sht:

roard/Makefile

@@ -25 +25 @@
 CONTLIBS  = $(lib_oggz) $(lib_sndfile) $(lib_ogg) $(lib_raum)
 OWNLIBS   = $(LIBROAREIO) $(LIBROARLIGHT) $(LIBROARMIDI) $(LIBROARDSP) $(LIBROAR)
-LIBS      = $(DRVLIBS) $(CODECLIBS) $(CONTLIBS) $(OWNLIBS)
+LIBS      = $(DRVLIBS) $(CODECLIBS) $(CONTLIBS) $(OWNLIBS) $(lib_slp)
 
 all: ${TARGETS}