|
 |
702687f |
diff --git a/voice/.makefile b/voice/.makefile
|
|
|
702687f |
index fef8ce5..5454412 100644
|
|
|
702687f |
--- a/voice/.makefile
|
|
|
702687f |
+++ b/voice/.makefile
|
|
 |
2902ece |
@@ -45,7 +45,7 @@ include/version.h:
|
|
|
2902ece |
depend: include/version.h
|
|
|
2902ece |
@echo "Creating depend files..."
|
|
|
2902ece |
@touch depend
|
|
|
2902ece |
- @for i in libpvf libutil libvoice libmgsm pvftools vgetty vm ;\
|
|
|
2902ece |
+ @for i in libpvf libutil libvoice pvftools vgetty vm ;\
|
|
|
2902ece |
do \
|
|
|
2902ece |
echo $$i"/depend" ;\
|
|
|
2902ece |
cd $$i ;\
|
|
|
702687f |
diff --git a/voice/Makefile b/voice/Makefile
|
|
|
702687f |
index d70db93..e2fccde 100644
|
|
|
702687f |
--- a/voice/Makefile
|
|
|
702687f |
+++ b/voice/Makefile
|
|
|
702687f |
@@ -18,11 +18,11 @@ MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o ../../g3file.o \
|
|
|
702687f |
../../locks.o ../../tio.o ../../modem.o ../../clean_line.o \
|
|
|
2902ece |
../../class1.o ../../class1lib.o ../../hyla_nsf.o
|
|
|
2902ece |
|
|
|
2902ece |
-LIBDIRS=libpvf libutil libvoice libmgsm
|
|
|
2902ece |
+LIBDIRS=libpvf libutil libvoice
|
|
|
2902ece |
LIBPVF=../libpvf/libpvf.a
|
|
|
2902ece |
LIBUTIL=../libutil/libutil.a
|
|
|
2902ece |
LIBVOICE=../libvoice/libvoice.a
|
|
|
2902ece |
-LIBGSM=../libmgsm/libmgsm.a
|
|
|
2902ece |
+LIBGSM=-lgsm
|
|
|
2902ece |
|
|
|
2902ece |
PROGRAMDIRS=pvftools vgetty vm
|
|
|
2902ece |
|
|
|
702687f |
diff --git a/voice/libpvf/depend b/voice/libpvf/depend
|
|
|
702687f |
index cacda6e..ab34c42 100644
|
|
|
702687f |
--- a/voice/libpvf/depend
|
|
|
702687f |
+++ b/voice/libpvf/depend
|
|
|
702687f |
@@ -47,7 +47,7 @@ usr.o: usr.c ../include/voice.h ../include/../../mgetty.h \
|
|
|
702687f |
../include/../../fax_lib.h ../include/IS_101.h ../include/bitsizes.h \
|
|
|
702687f |
../include/util.h ../include/config.h ../include/default.h \
|
|
|
702687f |
../include/event.h ../include/hardware.h ../include/header.h \
|
|
|
702687f |
- ../include/paths.h ../include/pvf.h ../include/wav.h ../libmgsm/gsm.h
|
|
|
702687f |
+ ../include/paths.h ../include/pvf.h ../include/wav.h
|
|
|
702687f |
voc.o: voc.c ../include/voice.h ../include/../../mgetty.h \
|
|
|
702687f |
../include/../../ugly.h ../include/../../config.h \
|
|
|
702687f |
../include/../../policy.h ../include/../../tio.h \
|
|
|
702687f |
diff --git a/voice/libpvf/usr.c b/voice/libpvf/usr.c
|
|
|
702687f |
index 3203d5e..c397beb 100644
|
|
|
702687f |
--- a/voice/libpvf/usr.c
|
|
|
702687f |
+++ b/voice/libpvf/usr.c
|
|
|
702687f |
@@ -43,7 +43,7 @@ int usrtopvf (FILE *fd_in, FILE *fd_out, int compression,
|
|
|
702687f |
/*****************
|
|
|
702687f |
** GSM SECTION **
|
|
|
702687f |
*****************/
|
|
|
702687f |
-#include "../libmgsm/gsm.h"
|
|
|
702687f |
+#include <gsm.h>
|
|
|
702687f |
|
|
|
702687f |
/* USR's GSM data format consists of 38-byte frames of data where the
|
|
|
702687f |
* first two bytes of the frame (usually "0xFE 0xFE" for valid data and
|