Changeset 1736:a639c278e59a in roaraudio

Timestamp:

05/17/09 21:14:35 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

use $*LIBS

File:

• roarclients/Makefile (modified) (4 diffs)

roarclients/Makefile

@@ -5 +5 @@
 
 #DEFINES        = -DDEBUG
-INCLUDE = -I../include -I./include
-CFLAGS += -g -Wall -O2 $(DEFINES) $(INCLUDE) $(INCPATH)
-LDFLAGS = -g -L../lib/ $(LDPATH) -lroar
+INCLUDE    = -I../include -I./include
+CFLAGS    += -g -Wall -O2 $(DEFINES) $(INCLUDE) $(INCPATH)
+LDFLAGS    = -g -L../lib/ $(LDPATH) -lroar
+LIBS       = -lroar
+DSPLIBS    = -lroardsp -lm $(LIBS)
+SHOUTLIBS  = $(lib_shout) $(LIBS)
+VORBISLIBS = $(lib_vorbisfile) $(lib_vorbis) $(lib_ogg) $(LIBS)
 
 all: ${TARGETS} $(TOOLS)
@@ -28 +32 @@
 roarbidir: roarbidir.o
 roarfilt: roarfilt.o
-        ${CC} ${LDFLAGS} -o roarfilt roarfilt.o $(lib_m) -lroardsp
+        ${CC} ${LDFLAGS} -o roarfilt roarfilt.o $(DSPLIBS)
 roarsin: roarsin.o
-        ${CC} ${LDFLAGS} -o roarsin roarsin.o $(lib_m)
+        ${CC} ${LDFLAGS} -o roarsin roarsin.o $(DSPLIBS)
 roarvumeter: roarvumeter.o
-        ${CC} ${LDFLAGS} -o roarvumeter roarvumeter.o $(lib_m)
+        ${CC} ${LDFLAGS} -o roarvumeter roarvumeter.o $(DSPLIBS)
 roarsockconnect: roarsockconnect.o
 roartypes: roartypes.o
@@ -38 +42 @@
 roar-config: roar-config.o
 roarvorbis: roarvorbis.o
-        ${CC} ${LDFLAGS} -o roarvorbis roarvorbis.o $(lib_vorbisfile) $(lib_vorbis) $(lib_ogg)
+        ${CC} ${LDFLAGS} -o roarvorbis roarvorbis.o $(VORBISLIBS)
 roarshout: roarshout.o
-        ${CC} ${LDFLAGS} -o roarshout roarshout.o $(lib_shout)
+        ${CC} ${LDFLAGS} -o roarshout roarshout.o $(SHOUTLIBS)
 polytest: polytest.o
-        ${CC} ${LDFLAGS} -o polytest polytest.o  -lroardsp
+        ${CC} ${LDFLAGS} -o polytest polytest.o $(DSPLIBS)
 pinentrytest: pinentrytest.o
 zcattest: zcattest.o
@@ -48 +52 @@
 pipetest: pipetest.o
 roarfctest: roarfctest.o
-        ${CC} ${LDFLAGS} -o roarfctest roarfctest.o $(lib_m) -lroardsp
+        ${CC} ${LDFLAGS} -o roarfctest roarfctest.o $(DSPLIBS)
 
 roarify.sht: