Move the codecs into a top-level "codecs" subdirectory; there's no

guarantee that all programs using the codecs will necessarily be using
GTK+.

svn path=/trunk/; revision=19117

14 files changed, 23 insertions, 17 deletions

diff --git a/Makefile.am b/Makefile.am
index c79423be36..3f789a9332 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,6 +285,7 @@ wireshark_optional_objects = @GETOPT_O@ @STRERROR_O@ \
 # linked into the wireshark executable.
 wireshark_additional_libs = \
 	gtk/libui.a		\
+	codecs/libcodec.a	\
 	wiretap/libwiretap.la	\
 	epan/libwireshark.la
 
@@ -716,7 +717,7 @@ else
 install-exec-hook:
 endif
 
-DIST_SUBDIRS = asn1 doc epan gtk help packaging plugins tools wiretap
+DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap
 
 if HAVE_PLUGINS
 SUBDIRS = tools wiretap doc epan plugins packaging help @wireshark_SUBDIRS@
diff --git a/Makefile.nmake b/Makefile.nmake
index 1848a7d5d2..e828023aeb 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -152,20 +152,20 @@ wiretap\wiretap-$(WTAP_VERSION).lib: wiretap
 !IFNDEF GTK1_DIR
 wireshark.exe	: 
 !ELSE
-wireshark.exe	: config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib gtk\libui.lib plugins
+wireshark.exe	: config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\libcodec.lib gtk\libui.lib plugins
 	@echo Linking $@
 	$(LINK) @<<
-		/OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK1_LIBS) gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res
+		/OUT:wireshark.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK1_LIBS) codecs\libcodec.lib gtk\libui.lib $(wireshark_OBJECTS) image\wireshark.res
 <<
 !ENDIF
 
 !IFNDEF GTK2_DIR
 wireshark-gtk2.exe	: 
 !ELSE
-wireshark-gtk2.exe	: config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib gtk2.tmp\libui.lib plugins
+wireshark-gtk2.exe	: config.h svnversion.h $(wireshark_OBJECTS) $(command_line_OBJECTS) codecs epan gtk2 image\wireshark.res wiretap\wiretap-$(WTAP_VERSION).lib codecs\libcodec.lib gtk2.tmp\libui.lib plugins
 	@echo Linking $@
 	$(LINK) @<<
-		/OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK2_LIBS) gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res
+		/OUT:wireshark-gtk2.exe $(guiflags) $(guilibsdll) $(LDFLAGS) /SUBSYSTEM:windows $(wireshark_LIBS) $(GTK2_LIBS) codecs\libcodec.lib gtk2.tmp\libui.lib $(wireshark_OBJECTS) image\wireshark.res
 <<
 !ENDIF
 
@@ -304,6 +304,8 @@ clean: gtk2_distclean
 	cd ..
 	cd wiretap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+	cd ../codecs
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../gtk
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
 	cd ../epan
@@ -328,6 +330,8 @@ distclean: clean gtk2_distclean
 	rm -f config.h $(BUILT_SOURCES)
 	cd wiretap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../codecs
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../gtk
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../epan
@@ -353,6 +357,8 @@ maintainer-clean: distclean
 	rm -f $(GENERATED_FILES)
 	cd wiretap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+	cd ../codecs
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../gtk
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
 	cd ../epan
@@ -386,6 +392,11 @@ wiretap::
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
 	cd ..
 
+codecs:: help config.h svnversion.h AUTHORS-SHORT doxygen
+        cd codecs
+        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+        cd ..
+
 gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen
 	cd gtk
 	$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake GTK_CFLAGS="$(GTK1_CFLAGS)" GTK_LIBS="$(GTK1_LIBS)" libui.lib
diff --git a/gtk/codecs/G711a/G711adecode.c b/codecs/G711a/G711adecode.c
index b427250a64..b427250a64 100644
--- a/gtk/codecs/G711a/G711adecode.c
+++ b/codecs/G711a/G711adecode.c
diff --git a/gtk/codecs/G711a/G711adecode.h b/codecs/G711a/G711adecode.h
index 779203a212..779203a212 100644
--- a/gtk/codecs/G711a/G711adecode.h
+++ b/codecs/G711a/G711adecode.h
diff --git a/gtk/codecs/G711a/G711atable.h b/codecs/G711a/G711atable.h
index a8d8999d3f..a8d8999d3f 100644
--- a/gtk/codecs/G711a/G711atable.h
+++ b/codecs/G711a/G711atable.h
diff --git a/gtk/codecs/G711u/G711udecode.c b/codecs/G711u/G711udecode.c
index 2ac3c8fd85..2ac3c8fd85 100644
--- a/gtk/codecs/G711u/G711udecode.c
+++ b/codecs/G711u/G711udecode.c
diff --git a/gtk/codecs/G711u/G711udecode.h b/codecs/G711u/G711udecode.h
index 8c808c500a..8c808c500a 100644
--- a/gtk/codecs/G711u/G711udecode.h
+++ b/codecs/G711u/G711udecode.h
diff --git a/gtk/codecs/G711u/G711utable.h b/codecs/G711u/G711utable.h
index 5a75a29c8b..5a75a29c8b 100644
--- a/gtk/codecs/G711u/G711utable.h
+++ b/codecs/G711u/G711utable.h
diff --git a/gtk/codecs/Makefile.am b/codecs/Makefile.am
index 6eb1a4c056..6eb1a4c056 100644
--- a/gtk/codecs/Makefile.am
+++ b/codecs/Makefile.am
diff --git a/gtk/codecs/Makefile.nmake b/codecs/Makefile.nmake
index a7822d63ac..a7822d63ac 100644
--- a/gtk/codecs/Makefile.nmake
+++ b/codecs/Makefile.nmake
diff --git a/configure.in b/configure.in
index de8db71929..05ab75bd32 100644
--- a/configure.in
+++ b/configure.in
@@ -431,7 +431,7 @@ if test "$GTK_OK" = "no" ; then
 else
 	wireshark_bin="wireshark\$(EXEEXT)"
 	wireshark_man="wireshark.1"
-        wireshark_SUBDIRS="gtk"
+        wireshark_SUBDIRS="codecs gtk"
 	# Honor GLIB_CFLAGS
 	if test "$GTK_OK" = "two" ; then
 		AM_PATH_GLIB_2_0(2.0.0, , AC_MSG_ERROR(GLib distribution not found.), gmodule)
@@ -1347,8 +1347,8 @@ AC_OUTPUT(
   epan/dfilter/Makefile
   epan/dissectors/Makefile
   epan/ftypes/Makefile
+  codecs/Makefile
   gtk/Makefile
-  gtk/codecs/Makefile
   gtk/doxygen.cfg
   help/Makefile
   packaging/Makefile
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 8be4d216ce..c4bd5e6f0f 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -28,7 +28,6 @@ noinst_LIBRARIES = libui.a
 CLEANFILES = \
 	libui.a		\
 	*~
-SUBDIRS = codecs
 
 MAINTAINERCLEANFILES = \
 	$(GENERATED_FILES)	\
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index ba3405074c..af91fe9733 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -51,8 +51,8 @@ WIRESHARK_TAP_OBJECTS = $(WIRESHARK_TAP_SRC:.c=.obj)
 WIRESHARK_WIN32_GTK_OBJECTS = $(WIRESHARK_WIN32_GTK_SRC:.c=.obj)
 	
 
-libui.lib	: ..\config.h $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) ..\gtk\codecs\codecs.lib
-	link /lib /out:libui.lib $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib ..\gtk\codecs\codecs.lib 
+libui.lib	: ..\config.h $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS)
+	link /lib /out:libui.lib $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) winmm.lib
 
 wireshark-tap-register.c: $(WIRESHARK_TAP_SRC) ../make-tapreg-dotc Makefile.common
 	@echo Making wireshark-tap-register.c
@@ -64,11 +64,6 @@ pa_lib.obj: $(PORTAUDIO_DIR)\pa_common\pa_lib.c
 pa_win_wmme.obj: $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c
 	$(CC) -c /Zi /W1 /Od /I$(PORTAUDIO_DIR)\pa_common $(PORTAUDIO_DIR)\pa_win_wmme\pa_win_wmme.c -o $@
 
-..\gtk\codecs\codecs.lib: 
-        cd codecs
-        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
-        cd ..
-
 clean:
 	rm -f $(WIRESHARK_WIN32_GTK_OBJECTS) $(WIRESHARK_TAP_OBJECTS) libui.lib $(PDB_FILE) doxygen.cfg html/*.*
 	if exist html rmdir html
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index bc18cd8ad6..171ebb0fa7 100644
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -70,8 +70,8 @@
 #include <epan/dissectors/packet-rtp.h>
 
 #include "rtp_player.h"
-#include "gtk/codecs/G711a/G711adecode.h"
-#include "gtk/codecs/G711u/G711udecode.h"
+#include "codecs/G711a/G711adecode.h"
+#include "codecs/G711u/G711udecode.h"
 #include <math.h>
 
 #ifndef min