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