1berry/wireshark
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More libcodecs -> libwscodecs.

Browse Source 
Change-Id: Ieb0bb131b6d141bf85997c9a0127e0eb11ea3a3b
Reviewed-on: https://code.wireshark.org/review/12420
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-12-03 16:09:57 -08:00
parent 651e0884b7
commit 3a54b294df
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
codecs/CMakeLists.txt
View File

@ -19,7 +19,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
set(CODECS_FILES set(WSCODECS_FILES
codecs.c codecs.c
G711a/G711adecode.c G711a/G711adecode.c
G711u/G711udecode.c G711u/G711udecode.c
@ -41,22 +41,22 @@ file(GLOB EXTRA_CODEC_HEADERS
) )
if(SBC_FOUND) if(SBC_FOUND)
set(CODECS_FILES ${CODECS_FILES} sbc/sbc.c) set(WSCODECS_FILES ${WSCODECS_FILES} sbc/sbc.c)
endif() endif()
set(codecs_LIBS set(wscodecs_LIBS
${GMODULE2_LIBRARIES} ${GMODULE2_LIBRARIES}
wsutil wsutil
) )
add_library(codecs ${LINK_MODE_LIB} add_library(wscodecs ${LINK_MODE_LIB}
${CODECS_FILES} ${WSCODECS_FILES}
${CMAKE_BINARY_DIR}/image/libwscodecs.rc ${CMAKE_BINARY_DIR}/image/libwscodecs.rc
) )
set(FULL_SO_VERSION "0.0.0") set(FULL_SO_VERSION "0.0.0")
set_target_properties(codecs PROPERTIES set_target_properties(wscodecs PROPERTIES
PREFIX "libws" PREFIX "libws"
COMPILE_DEFINITIONS "WS_BUILD_DLL" COMPILE_DEFINITIONS "WS_BUILD_DLL"
LINK_FLAGS "${WS_LINK_FLAGS}" LINK_FLAGS "${WS_LINK_FLAGS}"
@ -65,15 +65,15 @@ set_target_properties(codecs PROPERTIES
) )
if(ENABLE_APPLICATION_BUNDLE) if(ENABLE_APPLICATION_BUNDLE)
set_target_properties(codecs PROPERTIES set_target_properties(wscodecs PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks
) )
endif() endif()
target_link_libraries(codecs ${codecs_LIBS}) target_link_libraries(wscodecs ${wscodecs_LIBS})
if(NOT ${ENABLE_STATIC}) if(NOT ${ENABLE_STATIC})
install(TARGETS codecs install(TARGETS wscodecs
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

6
codecs/Makefile.am
View File

@ -1,5 +1,5 @@
# Makefile.am # Makefile.am
# Automake file for the libcodec library for Wireshark # Automake file for the libwscodec library for Wireshark
# #
# Wireshark - Network traffic analyzer # Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org> # By Gerald Combs <gerald@wireshark.org>
@ -41,7 +41,7 @@ libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@
# All sources that should be put in the source distribution tarball # All sources that should be put in the source distribution tarball
libwscodecs_la_SOURCES = \ libwscodecs_la_SOURCES = \
$(LIBCODECS_SRC) \ $(LIBWSCODECS_SRC) \
$(noinst_HEADERS) $(noinst_HEADERS)
libwscodecs_la_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la libwscodecs_la_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la
@ -54,7 +54,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
checkapi: checkapi:
$(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \
-sourcedir=$(srcdir) \ -sourcedir=$(srcdir) \
$(LIBCODECS_SRC) $(LIBWSCODECS_SRC)
EXTRA_DIST = \ EXTRA_DIST = \
CMakeLists.txt \ CMakeLists.txt \

2
codecs/Makefile.common
View File

@ -21,7 +21,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
LIBCODECS_SRC = \ LIBWSCODECS_SRC = \
codecs.c \ codecs.c \
G711a/G711adecode.c \ G711a/G711adecode.c \
G711u/G711udecode.c \ G711u/G711udecode.c \

16
codecs/Makefile.nmake
View File

@ -1,4 +1,4 @@
## Makefile for building libcodecs.dll with Microsoft C and nmake ## Makefile for building libwscodecs.dll with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
# #
@ -21,10 +21,10 @@ include Makefile.common
# if you add files here, be sure to include them also in Makefile.am EXTRA_DIST # if you add files here, be sure to include them also in Makefile.am EXTRA_DIST
# XXX - if the codec files weren't in subdirectories, we could just do # XXX - if the codec files weren't in subdirectories, we could just do
# LIBCODECS_OBJECTS = $(LIBCODECS_SRC:.c=.obj), and wouldn't need rules # LIBWSCODECS_OBJECTS = $(LIBWSCODECS_SRC:.c=.obj), and wouldn't need rules
# for each of the codecs below # for each of the codecs below
# #
LIBCODECS_OBJECTS= \ LIBWSCODECS_OBJECTS= \
codecs.obj \ codecs.obj \
G711udecode.obj \ G711udecode.obj \
G711adecode.obj \ G711adecode.obj \
@ -33,21 +33,21 @@ LIBCODECS_OBJECTS= \
resample.obj \ resample.obj \
sbc.obj sbc.obj
libcodecs_LIBS = \ libwscodecs_LIBS = \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
..\wsutil\libwsutil.lib ..\wsutil\libwsutil.lib
libwscodecs.lib: libwscodecs.dll libwscodecs.lib: libwscodecs.dll
libwscodecs.exp: libwscodecs.dll libwscodecs.exp: libwscodecs.dll
libwscodecs.dll : $(LIBCODECS_OBJECTS) ..\image\libwscodecs.res libwscodecs.dll : $(LIBWSCODECS_OBJECTS) ..\image\libwscodecs.res
@echo Linking libwscodecs.dll @echo Linking libwscodecs.dll
$(link) $(dlllflags) $(conlibsdll) \ $(link) $(dlllflags) $(conlibsdll) \
$(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \
/OUT:libwscodecs.dll \ /OUT:libwscodecs.dll \
/IMPLIB:libwscodecs.lib \ /IMPLIB:libwscodecs.lib \
..\image\libwscodecs.res \ ..\image\libwscodecs.res \
$(LIBCODECS_OBJECTS) $(libcodecs_LIBS) $(LIBWSCODECS_OBJECTS) $(libwscodecs_LIBS)
codecs.obj: codecs.c codecs.h codecs.obj: codecs.c codecs.h
$(CC) $(CFLAGS) -Fd.\ -c codecs.c /Fo%|fF.obj $(CC) $(CFLAGS) -Fd.\ -c codecs.c /Fo%|fF.obj
@ -71,7 +71,7 @@ sbc.obj: sbc\sbc.c sbc\sbc_private.h
$(CC) $(CFLAGS) -Fd.\ -c sbc\sbc.c /Fo%|fF.obj $(CC) $(CFLAGS) -Fd.\ -c sbc\sbc.c /Fo%|fF.obj
clean: clean:
rm -f $(LIBCODECS_OBJECTS) \ rm -f $(LIBWSCODECS_OBJECTS) \
libwscodecs.lib \ libwscodecs.lib \
libwscodecs.exp \ libwscodecs.exp \
libwscodecs.dll \ libwscodecs.dll \
@ -84,4 +84,4 @@ maintainer-clean: distclean
checkapi: checkapi:
$(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \
$(LIBCODECS_SRC) $(LIBWSCODECS_SRC)

2
ui/gtk/main.c
View File

@ -2553,7 +2553,7 @@ DIAG_ON(cast-qual)
/* Register all the plugin types we have. */ /* Register all the plugin types we have. */
epan_register_plugin_types(); /* Types known to libwireshark */ epan_register_plugin_types(); /* Types known to libwireshark */
wtap_register_plugin_types(); /* Types known to libwiretap */ wtap_register_plugin_types(); /* Types known to libwiretap */
codec_register_plugin_types(); /* Types known to libcodec */ codec_register_plugin_types(); /* Types known to libwscodecs */
/* Scan for plugins. This does *not* call their registration routines; /* Scan for plugins. This does *not* call their registration routines;
that's done later. */ that's done later. */

2
wireshark-qt.cpp
View File

@ -819,7 +819,7 @@ DIAG_ON(cast-qual)
/* Register all the plugin types we have. */ /* Register all the plugin types we have. */
epan_register_plugin_types(); /* Types known to libwireshark */ epan_register_plugin_types(); /* Types known to libwireshark */
wtap_register_plugin_types(); /* Types known to libwiretap */ wtap_register_plugin_types(); /* Types known to libwiretap */
codec_register_plugin_types(); /* Types known to libcodec */ codec_register_plugin_types(); /* Types known to libwscodecs */
/* Scan for plugins. This does *not* call their registration routines; /* Scan for plugins. This does *not* call their registration routines;
that's done later. */ that's done later. */