w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 13:30:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Updated Makefile.in and configure to use installed portaudio library.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1147 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2009-04-23 15:33:19 +00:00
parent 7508dd1fad
commit c750d4d6ee
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@ -37,7 +37,7 @@ RM ?= @RM@
F2PY = @F2PY@ F2PY = @F2PY@
### ###
all: portaudio-v19/lib/.libs/libportaudio.a Audio.so plrs plrr all: Audio.so plrs plrr
OBJS2C = init_rs.o encode_rs.o decode_rs.o plrr_subs.o loc.o deep65.o OBJS2C = init_rs.o encode_rs.o decode_rs.o plrr_subs.o loc.o deep65.o
@ -84,10 +84,6 @@ AUDIOSRCS = a2d.f90 jtaudio.c start_portaudio.c
### ###
portaudio-v19/lib/.libs/libportaudio.a:
(cd portaudio-v19;./configure)
(cd portaudio-v19;${MAKE})
deep65.o: deep65.F deep65.o: deep65.F
$(FC) -c -O0 -Wall -fPIC deep65.F $(FC) -c -O0 -Wall -fPIC deep65.F
@ -118,7 +114,7 @@ plrs: plrs.F90 sec_midn.F90 plrs_subs.c cutil.c
.PHONY : clean .PHONY : clean
clean: clean:
${RM} -f *.o *.pyc *.so *~ map65 map65.spec ${RM} -f *.o *.pyc *.so *~ map65 map65.spec
# (cd portaudio-v19;${MAKE} clean)
distclean: clean distclean: clean
${RM} -f config.log config.status Makefile ${RM} -f config.log config.status Makefile
(cd portaudio-v19;${MAKE} distclean) (cd portaudio-v19;${MAKE} distclean)

2
configure vendored
View File

@ -2502,7 +2502,7 @@ CFLAGS="$OLD_CFLAGS"
CPPFLAGS="-Iportaudio-v19/include -I/usr/local/include -I/usr/include/alsa -I/usr/local/include/alsa ${CPPFLAGS}" CPPFLAGS="-Iportaudio-v19/include -I/usr/local/include -I/usr/include/alsa -I/usr/local/include/alsa ${CPPFLAGS}"
LDFLAGS="-L/usr/local/lib ${LDFLAGS}" LDFLAGS="-L/usr/local/lib ${LDFLAGS}"
LIBS=" -lpthread ${LIBS}" LIBS=" -lpthread -lportaudio ${LIBS}"
echo "$as_me:$LINENO: checking uname -s for Cygwin, Solaris or HPUX" >&5 echo "$as_me:$LINENO: checking uname -s for Cygwin, Solaris or HPUX" >&5
echo $ECHO_N "checking uname -s for Cygwin, Solaris or HPUX... $ECHO_C" >&6 echo $ECHO_N "checking uname -s for Cygwin, Solaris or HPUX... $ECHO_C" >&6

2
map65.py
View File

@ -1,4 +1,4 @@
#--------------------------------------------------------------------- MAP65 #---------------------------------------------------------------------- MAP65
# $Date$ $Revision$ # $Date$ $Revision$
# #
from Tkinter import * from Tkinter import *