15 files changed, 7 insertions, 7 deletions
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index 4d6780737..a35629e2e 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -86,7 +86,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
 	gnuradio-core/src/guile/gr-run-waveform-script \
         gnuradio-core/src/lib/Makefile \
         gnuradio-core/src/lib/filter/Makefile \
-        gnuradio-core/src/lib/g72x/Makefile \
         gnuradio-core/src/lib/general/Makefile \
         gnuradio-core/src/lib/general/gr_constants.cc \
         gnuradio-core/src/lib/gengen/Makefile \
diff --git a/config/grc_gr_vocoder.m4 b/config/grc_gr_vocoder.m4
index fa620ad05..df75656fe 100644
--- a/config/grc_gr_vocoder.m4
+++ b/config/grc_gr_vocoder.m4
@@ -33,6 +33,7 @@ AC_DEFUN([GRC_GR_VOCODER],[
         gr-vocoder/include/Makefile \
         gr-vocoder/lib/Makefile \
 	gr-vocoder/lib/codec2/Makefile \
+	gr-vocoder/lib/g7xx/Makefile \
 	gr-vocoder/lib/gsm/Makefile \
         gr-vocoder/python/Makefile \
 	gr-vocoder/python/run_tests \
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index 4db2ff167..979ac7f91 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common
 ## Process this file with automake to produce Makefile.in
 
 # We've got to build . before swig
-SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io hier . swig
+SUBDIRS = missing runtime filter viterbi general gengen reed-solomon io hier . swig
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES)
 
@@ -43,7 +43,6 @@ libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
 
 libgnuradio_core_la_LIBADD  = 		\
 	filter/libfilter.la		\
-	g72x/libccitt.la		\
 	viterbi/libviterbi.la		\
 	general/libgeneral.la		\
 	gengen/libgengen.la		\
diff --git a/gr-vocoder/lib/Makefile.am b/gr-vocoder/lib/Makefile.am
index 198371f47..44ad67756 100644
--- a/gr-vocoder/lib/Makefile.am
+++ b/gr-vocoder/lib/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = codec2 gsm .
+SUBDIRS = codec2 g7xx gsm .
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \
 	      -I$(top_srcdir)/gr-vocoder/include
@@ -39,6 +39,7 @@ libgnuradio_vocoder_la_SOURCES = \
 libgnuradio_vocoder_la_LIBADD =	\
 	$(GNURADIO_CORE_LA) \
 	codec2/libcodec2.la \
+	g7xx/libg7xx.la \
 	gsm/libgsm.la
 
 libgnuradio_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
diff --git a/gnuradio-core/src/lib/g72x/.gitignore b/gr-vocoder/lib/g7xx/.gitignore
index a02b6ff73..a02b6ff73 100644
--- a/gnuradio-core/src/lib/g72x/.gitignore
+++ b/gr-vocoder/lib/g7xx/.gitignore
diff --git a/gnuradio-core/src/lib/g72x/Makefile.am b/gr-vocoder/lib/g7xx/Makefile.am
index d2700376f..929fd23ba 100644
--- a/gnuradio-core/src/lib/g72x/Makefile.am
+++ b/gr-vocoder/lib/g7xx/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001 Free Software Foundation, Inc.
+# Copyright 2001,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-noinst_LTLIBRARIES = libccitt.la
-libccitt_la_SOURCES = g711.c g72x.c g721.c g723_24.c g723_40.c g72x.h
+noinst_LTLIBRARIES = libg7xx.la
+libg7xx_la_SOURCES = g711.c g72x.c g721.c g723_24.c g723_40.c g72x.h
 
 EXTRA_DIST += encode.c decode.c
diff --git a/gnuradio-core/src/lib/g72x/README b/gr-vocoder/lib/g7xx/README
index 23b0e7dd5..23b0e7dd5 100644
--- a/gnuradio-core/src/lib/g72x/README
+++ b/gr-vocoder/lib/g7xx/README
diff --git a/gnuradio-core/src/lib/g72x/decode.c b/gr-vocoder/lib/g7xx/decode.c
index cf8c739c5..cf8c739c5 100644
--- a/gnuradio-core/src/lib/g72x/decode.c
+++ b/gr-vocoder/lib/g7xx/decode.c
diff --git a/gnuradio-core/src/lib/g72x/encode.c b/gr-vocoder/lib/g7xx/encode.c
index e74482869..e74482869 100644
--- a/gnuradio-core/src/lib/g72x/encode.c
+++ b/gr-vocoder/lib/g7xx/encode.c
diff --git a/gnuradio-core/src/lib/g72x/g711.c b/gr-vocoder/lib/g7xx/g711.c
index d4d60a5c2..d4d60a5c2 100644
--- a/gnuradio-core/src/lib/g72x/g711.c
+++ b/gr-vocoder/lib/g7xx/g711.c
diff --git a/gnuradio-core/src/lib/g72x/g721.c b/gr-vocoder/lib/g7xx/g721.c
index 445f177e8..445f177e8 100644
--- a/gnuradio-core/src/lib/g72x/g721.c
+++ b/gr-vocoder/lib/g7xx/g721.c
diff --git a/gnuradio-core/src/lib/g72x/g723_24.c b/gr-vocoder/lib/g7xx/g723_24.c
index 452f4daeb..452f4daeb 100644
--- a/gnuradio-core/src/lib/g72x/g723_24.c
+++ b/gr-vocoder/lib/g7xx/g723_24.c
diff --git a/gnuradio-core/src/lib/g72x/g723_40.c b/gr-vocoder/lib/g7xx/g723_40.c
index 4858baf40..4858baf40 100644
--- a/gnuradio-core/src/lib/g72x/g723_40.c
+++ b/gr-vocoder/lib/g7xx/g723_40.c
diff --git a/gnuradio-core/src/lib/g72x/g72x.c b/gr-vocoder/lib/g7xx/g72x.c
index 9a823c755..9a823c755 100644
--- a/gnuradio-core/src/lib/g72x/g72x.c
+++ b/gr-vocoder/lib/g7xx/g72x.c
diff --git a/gnuradio-core/src/lib/g72x/g72x.h b/gr-vocoder/lib/g7xx/g72x.h
index 33807171a..33807171a 100644
--- a/gnuradio-core/src/lib/g72x/g72x.h
+++ b/gr-vocoder/lib/g7xx/g72x.h