From 37c9bd44fedd343c3eee5788a76de87e721b6821 Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Tue, 5 Sep 2006 18:06:17 +0000
Subject: [PATCH] cleanup

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2512 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/codec/g7xx/Makefile.am              |  4 +--
 libs/codec/g7xx/Makefile.in              | 37 ++++++++++++------------
 libs/codec/g7xx/autoscan.log             |  0
 libs/codec/g7xx/{ => src}/g711.c         |  0
 libs/codec/g7xx/{ => src}/g722_decode.c  |  0
 libs/codec/g7xx/{ => src}/g722_encode.c  |  0
 libs/codec/g7xx/{ => src}/g726.c         |  0
 libs/codec/g7xx/{ => src/include}/g711.h |  0
 libs/codec/g7xx/{ => src/include}/g722.h |  0
 libs/codec/g7xx/{ => src/include}/g726.h |  0
 10 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 libs/codec/g7xx/autoscan.log
 rename libs/codec/g7xx/{ => src}/g711.c (100%)
 rename libs/codec/g7xx/{ => src}/g722_decode.c (100%)
 rename libs/codec/g7xx/{ => src}/g722_encode.c (100%)
 rename libs/codec/g7xx/{ => src}/g726.c (100%)
 rename libs/codec/g7xx/{ => src/include}/g711.h (100%)
 rename libs/codec/g7xx/{ => src/include}/g722.h (100%)
 rename libs/codec/g7xx/{ => src/include}/g726.h (100%)

diff --git a/libs/codec/g7xx/Makefile.am b/libs/codec/g7xx/Makefile.am
index 5a35060fa4..d31361b4e7 100644
--- a/libs/codec/g7xx/Makefile.am
+++ b/libs/codec/g7xx/Makefile.am
@@ -3,12 +3,12 @@ AUTOMAKE_OPTS	= gnu
 MAKE		= gmake
 NAME		= libg7xx
 lib_LTLIBRARIES		= libg7xx.la
-libg7xx_la_SOURCES	= g711.c g722_decode.c g722_encode.c g726.c
+libg7xx_la_SOURCES	= src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c
 
 libg7xx_la_CFLAGS	= $(AM_CFLAGS)
 libg7xx_la_LDFLAGS	= 
 
 library_includedir      = $(prefix)/include/g7xx
-library_include_HEADERS = g722.h g711.h g726.h
+library_include_HEADERS = src/include/g722.h src/include/g711.h src/include/g726.h
 
 
diff --git a/libs/codec/g7xx/Makefile.in b/libs/codec/g7xx/Makefile.in
index 3f6290c7e9..cedea1e2a8 100644
--- a/libs/codec/g7xx/Makefile.in
+++ b/libs/codec/g7xx/Makefile.in
@@ -196,11 +196,11 @@ AUTOMAKE_OPTS = gnu
 MAKE = gmake
 NAME = libg7xx
 lib_LTLIBRARIES = libg7xx.la
-libg7xx_la_SOURCES = g711.c g722_decode.c g722_encode.c g726.c
+libg7xx_la_SOURCES = src/g711.c src/g722_decode.c src/g722_encode.c src/g726.c
 libg7xx_la_CFLAGS = $(AM_CFLAGS)
 libg7xx_la_LDFLAGS = 
 library_includedir = $(prefix)/include/g7xx
-library_include_HEADERS = g722.h g711.h g726.h
+library_include_HEADERS = src/include/g722.h src/include/g711.h src/include/g726.h
 all: all-am
 
 .SUFFIXES:
@@ -300,33 +300,33 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-libg7xx_la-g711.lo: g711.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g711.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g711.Tpo" -c -o libg7xx_la-g711.lo `test -f 'g711.c' || echo '$(srcdir)/'`g711.c; \
+libg7xx_la-g711.lo: src/g711.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g711.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g711.Tpo" -c -o libg7xx_la-g711.lo `test -f 'src/g711.c' || echo '$(srcdir)/'`src/g711.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libg7xx_la-g711.Tpo" "$(DEPDIR)/libg7xx_la-g711.Plo"; else rm -f "$(DEPDIR)/libg7xx_la-g711.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='g711.c' object='libg7xx_la-g711.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/g711.c' object='libg7xx_la-g711.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g711.lo `test -f 'g711.c' || echo '$(srcdir)/'`g711.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g711.lo `test -f 'src/g711.c' || echo '$(srcdir)/'`src/g711.c
 
-libg7xx_la-g722_decode.lo: g722_decode.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g722_decode.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g722_decode.Tpo" -c -o libg7xx_la-g722_decode.lo `test -f 'g722_decode.c' || echo '$(srcdir)/'`g722_decode.c; \
+libg7xx_la-g722_decode.lo: src/g722_decode.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g722_decode.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g722_decode.Tpo" -c -o libg7xx_la-g722_decode.lo `test -f 'src/g722_decode.c' || echo '$(srcdir)/'`src/g722_decode.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libg7xx_la-g722_decode.Tpo" "$(DEPDIR)/libg7xx_la-g722_decode.Plo"; else rm -f "$(DEPDIR)/libg7xx_la-g722_decode.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='g722_decode.c' object='libg7xx_la-g722_decode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/g722_decode.c' object='libg7xx_la-g722_decode.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g722_decode.lo `test -f 'g722_decode.c' || echo '$(srcdir)/'`g722_decode.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g722_decode.lo `test -f 'src/g722_decode.c' || echo '$(srcdir)/'`src/g722_decode.c
 
-libg7xx_la-g722_encode.lo: g722_encode.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g722_encode.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g722_encode.Tpo" -c -o libg7xx_la-g722_encode.lo `test -f 'g722_encode.c' || echo '$(srcdir)/'`g722_encode.c; \
+libg7xx_la-g722_encode.lo: src/g722_encode.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g722_encode.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g722_encode.Tpo" -c -o libg7xx_la-g722_encode.lo `test -f 'src/g722_encode.c' || echo '$(srcdir)/'`src/g722_encode.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libg7xx_la-g722_encode.Tpo" "$(DEPDIR)/libg7xx_la-g722_encode.Plo"; else rm -f "$(DEPDIR)/libg7xx_la-g722_encode.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='g722_encode.c' object='libg7xx_la-g722_encode.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/g722_encode.c' object='libg7xx_la-g722_encode.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g722_encode.lo `test -f 'g722_encode.c' || echo '$(srcdir)/'`g722_encode.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g722_encode.lo `test -f 'src/g722_encode.c' || echo '$(srcdir)/'`src/g722_encode.c
 
-libg7xx_la-g726.lo: g726.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g726.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g726.Tpo" -c -o libg7xx_la-g726.lo `test -f 'g726.c' || echo '$(srcdir)/'`g726.c; \
+libg7xx_la-g726.lo: src/g726.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -MT libg7xx_la-g726.lo -MD -MP -MF "$(DEPDIR)/libg7xx_la-g726.Tpo" -c -o libg7xx_la-g726.lo `test -f 'src/g726.c' || echo '$(srcdir)/'`src/g726.c; \
 @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libg7xx_la-g726.Tpo" "$(DEPDIR)/libg7xx_la-g726.Plo"; else rm -f "$(DEPDIR)/libg7xx_la-g726.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='g726.c' object='libg7xx_la-g726.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/g726.c' object='libg7xx_la-g726.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g726.lo `test -f 'g726.c' || echo '$(srcdir)/'`g726.c
+@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libg7xx_la_CFLAGS) $(CFLAGS) -c -o libg7xx_la-g726.lo `test -f 'src/g726.c' || echo '$(srcdir)/'`src/g726.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -406,6 +406,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
+	$(mkdir_p) $(distdir)/src/include
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/libs/codec/g7xx/autoscan.log b/libs/codec/g7xx/autoscan.log
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/libs/codec/g7xx/g711.c b/libs/codec/g7xx/src/g711.c
similarity index 100%
rename from libs/codec/g7xx/g711.c
rename to libs/codec/g7xx/src/g711.c
diff --git a/libs/codec/g7xx/g722_decode.c b/libs/codec/g7xx/src/g722_decode.c
similarity index 100%
rename from libs/codec/g7xx/g722_decode.c
rename to libs/codec/g7xx/src/g722_decode.c
diff --git a/libs/codec/g7xx/g722_encode.c b/libs/codec/g7xx/src/g722_encode.c
similarity index 100%
rename from libs/codec/g7xx/g722_encode.c
rename to libs/codec/g7xx/src/g722_encode.c
diff --git a/libs/codec/g7xx/g726.c b/libs/codec/g7xx/src/g726.c
similarity index 100%
rename from libs/codec/g7xx/g726.c
rename to libs/codec/g7xx/src/g726.c
diff --git a/libs/codec/g7xx/g711.h b/libs/codec/g7xx/src/include/g711.h
similarity index 100%
rename from libs/codec/g7xx/g711.h
rename to libs/codec/g7xx/src/include/g711.h
diff --git a/libs/codec/g7xx/g722.h b/libs/codec/g7xx/src/include/g722.h
similarity index 100%
rename from libs/codec/g7xx/g722.h
rename to libs/codec/g7xx/src/include/g722.h
diff --git a/libs/codec/g7xx/g726.h b/libs/codec/g7xx/src/include/g726.h
similarity index 100%
rename from libs/codec/g7xx/g726.h
rename to libs/codec/g7xx/src/include/g726.h