[xiph-commits] r10347 - trunk/xiph-rtp

[giles at svn.xiph.org]

Author: giles
Date: 2005-11-05 23:40:34 -0800 (Sat, 05 Nov 2005)
New Revision: 10347

Modified:
   trunk/xiph-rtp/Makefile
Log:
Fiddle with the makefile some more. This isn't really better.


Modified: trunk/xiph-rtp/Makefile
===================================================================
--- trunk/xiph-rtp/Makefile	2005-11-06 00:25:25 UTC (rev 10346)
+++ trunk/xiph-rtp/Makefile	2005-11-06 07:40:34 UTC (rev 10347)
@@ -1,15 +1,17 @@
 # GNU Makefile for xiph rtp example code
 
-CC = gcc -g -O2 -Wall
+CC = gcc -g -O2 -Wall -DDEBUG
 PROGS = vorbisrtp vorbisrtp-client theorartp-client
 
-OGG_CFLAGS = $(shell pkg-config --cflags ogg)
-OGG_LIBS = $(shell pkg-config --libs ogg)
-VORBIS_CFLAGS = $(shell pkg-config --cflags vorbis)
-VORBIS_LIBS = $(shell pkg-config --libs vorbis)
-THEORA_CFLAGS = $(shell pkg-config --cflags theora)
-THEORA_LIBS = $(shell pkg-config --libs theora)
+vorbisrtp_SRCS = vorbisrtp.c
+vorbisrtp_PKGS = ogg vorbis
 
+vorbisrtp-client_SRCS = vorbisrtp-client.c
+vorbisrtp-client_PKGS = ogg vorbis
+
+theorartp-client_SRCS = theorartp-client.c
+theorartp-client_PKGS = ogg
+
 all : $(PROGS)
 
 clean:
@@ -17,12 +19,13 @@
 	-$(RM) $(PROGS)
 
 vorbisrtp : vorbisrtp.c
-	$(CC) -fpack-struct -o $@ $(OGG_CFLAGS) $(VORBIS_CFLAGS) \
-		$< $(VORBIS_LIBS) $(OGG_LIBS)
+	$(CC) -fpack-struct -o $@ `pkg-config --cflags $($@_PKGS)` \
+		$< `pkg-config --libs $($@_PKGS)`
 
 vorbisrtp-client : vorbisrtp-client.c
-	$(CC) -fpack-struct -o $@ $(OGG_CFLAGS) $(VORBIS_CFLAGS) \
-		$< $(VORBIS_LIBS) $(OGG_LIBS)
+	$(CC) -fpack-struct -o $@  `pkg-config --cflags $($@_PKGS)` \
+		$< `pkg-config --libs $($@_PKGS)`
 
 theorartp-client :theorartp-client.c
-	$(CC) -fpack-struct -o $@ $(OGG_CFLAGS) $< $(OGG_LIBS)
+	$(CC) -fpack-struct -o $@ `pkg-config --cflags $($@_PKGS)` \
+		$< `pkg-config --libs $($@_PKGS)`