[Iaxclient-cvs] SF.net SVN: iaxclient: [1404] trunk/simpleclient

[<jpg...@us...>]

Revision: 1404
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1404&view=rev
Author:   jpgrayson
Date:     2008-04-15 15:16:27 -0700 (Tue, 15 Apr 2008)

Log Message:
-----------
Update Makefile.am for stresstest, testcall, and vtestcall to use variables from pkgconfig to get all of the appropriate compile and link flags.

Modified Paths:
--------------
    trunk/simpleclient/stresstest/Makefile.am
    trunk/simpleclient/testcall/Makefile.am
    trunk/simpleclient/vtestcall/Makefile.am

Modified: trunk/simpleclient/stresstest/Makefile.am
===================================================================
--- trunk/simpleclient/stresstest/Makefile.am	2008-04-15 22:14:46 UTC (rev 1403)
+++ trunk/simpleclient/stresstest/Makefile.am	2008-04-15 22:16:27 UTC (rev 1404)
@@ -1,16 +1,20 @@
-bin_PROGRAMS=stresstest
-stresstest_SOURCES=stresstest.c file.c file.h
+bin_PROGRAMS = stresstest
 
-AM_CPPFLAGS=-I$(top_srcdir)/lib $(SDL_CFLAGS) $(OGGZ_CFLAGS) $(THEORA_CFLAGS)
-stresstest_LDADD=$(top_builddir)/lib/libiaxclient.la $(OGGZ_LIBS) $(THEORA_LIBS)
+stresstest_SOURCES = stresstest.c file.c file.h
 
-if MACOSX
-stresstest_LDFLAGS =			\
-		-framework AudioToolbox \
-		-framework AudioUnit	\
-		-framework Carbon	\
-		-framework CoreAudio	\
-		-framework QuartzCore	\
-		-framework QuickTime
-endif
+stresstest_CPPFLAGS = -I$(top_srcdir)/lib
+stresstest_CFLAGS = $(OGGZ_CFLAGS) \
+		    $(THEORA_CFLAGS) \
+		    $(PORTAUDIO_CFLAGS) \
+		    $(SPEEX_CFLAGS) \
+		    $(VIDCAP_CFLAGS)
+stresstest_LDFLAGS =
+stresstest_LDADD = $(top_builddir)/lib/libiaxclient.la \
+		   $(OGGZ_LIBS) \
+		   $(THEORA_LIBS) \
+		   $(PORTAUDIO_LIBS) \
+		   $(SPEEX_LIBS) \
+		   $(VIDCAP_LIBS)
 
+
+

Modified: trunk/simpleclient/testcall/Makefile.am
===================================================================
--- trunk/simpleclient/testcall/Makefile.am	2008-04-15 22:14:46 UTC (rev 1403)
+++ trunk/simpleclient/testcall/Makefile.am	2008-04-15 22:16:27 UTC (rev 1404)
@@ -1,11 +1,16 @@
-bin_PROGRAMS=testcall
-testcall_SOURCES=testcall.c
+bin_PROGRAMS = testcall
 
-AM_CPPFLAGS=-I$(top_srcdir)/lib
-LDADD=$(top_builddir)/lib/libiaxclient.la
+testcall_SOURCES = testcall.c
 
-if ! WIN32
-AM_CPPFLAGS += -DPOSIXSLEEP
+testcall_CPPFLAGS = -I$(top_srcdir)/lib
+testcall_CFLAGS = $(PORTAUDIO_CFLAGS) $(SPEEX_CFLAGS)
+testcall_LDFLAGS =
+testcall_LDADD = $(top_builddir)/lib/libiaxclient.la \
+		 $(PORTAUDIO_LIBS) $(SPEEX_LIBS)
+
+if VIDEO
+testcall_CFLAGS += $(THEORA_CFLAGS) $(VIDCAP_CFLAGS)
+testcall_LDADD += $(THEORA_LIBS) $(VIDCAP_LIBS)
 endif
 
 EXTRA_DIST = testcall-jb.c

Modified: trunk/simpleclient/vtestcall/Makefile.am
===================================================================
--- trunk/simpleclient/vtestcall/Makefile.am	2008-04-15 22:14:46 UTC (rev 1403)
+++ trunk/simpleclient/vtestcall/Makefile.am	2008-04-15 22:16:27 UTC (rev 1404)
@@ -1,7 +1,21 @@
-bin_PROGRAMS=vtestcall
-vtestcall_SOURCES=vtestcall.c
+bin_PROGRAMS = vtestcall
+vtestcall_SOURCES = vtestcall.c
 
-AM_CPPFLAGS=-I$(top_srcdir)/lib $(SDL_CFLAGS) $(OGGZ_CFLAGS)
-vtestcall_LDADD=$(top_builddir)/lib/libiaxclient.la $(SDL_LIBS) $(OGGZ_LIBS)
+vtestcall_CPPFLAGS = -I$(top_srcdir)/lib
+vtestcall_CFLAGS = $(SDL_CFLAGS) \
+		   $(OGGZ_CFLAGS) \
+		   $(PORTAUDIO_CFLAGS) \
+		   $(SPEEX_CFLAGS) \
+		   $(THEORA_CFLAGS) \
+		   $(VIDCAP_CFLAGS)
 
+vtestcall_LDADD = $(top_builddir)/lib/libiaxclient.la \
+		  $(SDL_LIBS) \
+		  $(OGGZ_LIBS) \
+		  $(PORTAUDIO_LIBS) \
+		  $(SPEEX_LIBS) \
+		  $(THEORA_LIBS) \
+		  $(VIDCAP_LIBS)
+
 EXTRA_DIST =
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.