File iaxmodem-unbundle-spandsp-libiax.patch of Package iaxmodem

Overview Repositories Revisions Requests Users Attributes Meta

File iaxmodem-unbundle-spandsp-libiax.patch of Package iaxmodem (Revision f39ec7f245542736fb01a3cbbc92cbab)

Currently displaying revision f39ec7f245542736fb01a3cbbc92cbab , Show latest

Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,37 +3,23 @@ DSPVER=		@DSPVER@
 IAXVER=		@IAXVER@
 
 CFLAGS:=	-DMODEMVER=\"${MODEMVER}\" -DDSPVER=\"${DSPVER}\" -DIAXVER=\"${IAXVER}\" \
-		-Wall -g -DSTATICLIBS -DUSE_UNIX98_PTY \
-		-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src \
-		${CFLAGS}
-OUR_CFLAGS=	-Wall -g -DSTATICLIBS -DUSE_UNIX98_PTY \
-		-std=c99 -Ilib/libiax2/src -Ilib/spandsp/src
-OBJS=		iaxmodem.o lib/spandsp/src/.libs/libspandsp.a lib/libiax2/src/.libs/libiax.a
-LDFLAGS+=	-lm -lutil -ltiff
+		-Wall -g -DUSE_UNIX98_PTY -std=c99 ${CFLAGS}
+OBJS=		iaxmodem.o
+LDFLAGS+=	-lm -lutil -ltiff -liax -lspandsp
 
 all: iaxmodem
 
-iaxmodem: build-libiax build-libspandsp iaxmodem.o
+iaxmodem: iaxmodem.o
 	${CC} ${CFLAGS} ${OBJS} -o iaxmodem ${LDFLAGS}
 
 iaxmodem.o: iaxmodem.c
 	${CC} ${CFLAGS} -c iaxmodem.c
 
-build-libiax:
-	cd lib/libiax2 && ${MAKE}
-
-build-libspandsp:
-	cd lib/spandsp && ${MAKE}
-
 clean:
-	rm -f *.o && \
-	cd lib/libiax2 && ${MAKE} clean && \
-	cd ../../lib/spandsp && ${MAKE} clean
+	rm -f *.o
 
 distclean:
 	rm -f *.o && \
-	cd lib/libiax2 && ${MAKE} distclean && \
-	cd ../../lib/spandsp && ${MAKE} distclean && \
-	cd ../.. && rm -f iaxmodem && \
+	rm -f iaxmodem && \
 	rm -f Makefile
 
Index: b/configure
===================================================================
--- a/configure
+++ b/configure
@@ -1,31 +1,15 @@
 #!/bin/sh
-cd lib/libiax2 && \
-./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --disable-shared && \
-cd ../../lib/spandsp && \
-./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" --disable-shared && \
-cd ../..
-
-if [ $? != 0 ]; then
-	exit 1
-fi
-
 IAXMODEMVER="`cat VERSION`"
-DSPVER=`grep "^ VERSION=" lib/spandsp/configure | sed "s/ VERSION='*$[^']*$'*/\1/g"`
-if [ -n "${DSPVER}" ]; then
-	DSPVER="spandsp-${DSPVER}+"
-fi
-IAXVER=`grep "^ VERSION=" lib/libiax2/configure | sed "s/ VERSION='*$[^']*$'*/\1/g"`
-if [ -n "${IAXVER}" ]; then
-	IAXVER="libiax2-${IAXVER}-SVN-20071223+"
-fi
+DSPVER=$(rpm -q --qf '%{VERSION}\n' spandsp-devel)
+IAXVER=$(rpm -q --qf '%{VERSION}\n' libiax-devel)
 
 cat Makefile.in | sed -e "s/@VERSION@/${IAXMODEMVER}/g" | \
 	sed -e "s/@DSPVER@/${DSPVER}/g" | \
 	sed -e "s/@IAXVER@/${IAXVER}/g" > Makefile
 
-echo ${IAXMODEMVER}
-echo ${IAXVER}
-echo ${DSPVER}
+echo iaxmodem: ${IAXMODEMVER}
+echo libiax: ${IAXVER}
+echo spandsp: ${DSPVER}
 
 exit $?

Places

File iaxmodem-unbundle-spandsp-libiax.patch of Package iaxmodem (Revision f39ec7f245542736fb01a3cbbc92cbab)

Places