From 3a54b294df6f1089e33edc209b764deaee141ada Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 3 Dec 2015 16:09:57 -0800 Subject: More libcodecs -> libwscodecs. Change-Id: Ieb0bb131b6d141bf85997c9a0127e0eb11ea3a3b Reviewed-on: https://code.wireshark.org/review/12420 Reviewed-by: Guy Harris --- codecs/CMakeLists.txt | 18 +++++++++--------- codecs/Makefile.am | 6 +++--- codecs/Makefile.common | 2 +- codecs/Makefile.nmake | 16 ++++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'codecs') diff --git a/codecs/CMakeLists.txt b/codecs/CMakeLists.txt index 9f4d64a1b2..37aa95163f 100644 --- a/codecs/CMakeLists.txt +++ b/codecs/CMakeLists.txt @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -set(CODECS_FILES +set(WSCODECS_FILES codecs.c G711a/G711adecode.c G711u/G711udecode.c @@ -41,22 +41,22 @@ file(GLOB EXTRA_CODEC_HEADERS ) if(SBC_FOUND) - set(CODECS_FILES ${CODECS_FILES} sbc/sbc.c) + set(WSCODECS_FILES ${WSCODECS_FILES} sbc/sbc.c) endif() -set(codecs_LIBS +set(wscodecs_LIBS ${GMODULE2_LIBRARIES} wsutil ) -add_library(codecs ${LINK_MODE_LIB} - ${CODECS_FILES} +add_library(wscodecs ${LINK_MODE_LIB} + ${WSCODECS_FILES} ${CMAKE_BINARY_DIR}/image/libwscodecs.rc ) set(FULL_SO_VERSION "0.0.0") -set_target_properties(codecs PROPERTIES +set_target_properties(wscodecs PROPERTIES PREFIX "libws" COMPILE_DEFINITIONS "WS_BUILD_DLL" LINK_FLAGS "${WS_LINK_FLAGS}" @@ -65,15 +65,15 @@ set_target_properties(codecs PROPERTIES ) 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 ) endif() -target_link_libraries(codecs ${codecs_LIBS}) +target_link_libraries(wscodecs ${wscodecs_LIBS}) if(NOT ${ENABLE_STATIC}) - install(TARGETS codecs + install(TARGETS wscodecs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 6d67087682..d55b259644 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -1,5 +1,5 @@ # Makefile.am -# Automake file for the libcodec library for Wireshark +# Automake file for the libwscodec library for Wireshark # # Wireshark - Network traffic analyzer # By Gerald Combs @@ -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 libwscodecs_la_SOURCES = \ - $(LIBCODECS_SRC) \ + $(LIBWSCODECS_SRC) \ $(noinst_HEADERS) libwscodecs_la_DEPENDENCIES = ${top_builddir}/wsutil/libwsutil.la @@ -54,7 +54,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ -sourcedir=$(srcdir) \ - $(LIBCODECS_SRC) + $(LIBWSCODECS_SRC) EXTRA_DIST = \ CMakeLists.txt \ diff --git a/codecs/Makefile.common b/codecs/Makefile.common index f1af69f663..66aa79dde4 100644 --- a/codecs/Makefile.common +++ b/codecs/Makefile.common @@ -21,7 +21,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -LIBCODECS_SRC = \ +LIBWSCODECS_SRC = \ codecs.c \ G711a/G711adecode.c \ G711u/G711udecode.c \ diff --git a/codecs/Makefile.nmake b/codecs/Makefile.nmake index 1cc2be66ba..336bd74cef 100644 --- a/codecs/Makefile.nmake +++ b/codecs/Makefile.nmake @@ -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 # @@ -21,10 +21,10 @@ include Makefile.common # 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 -# 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 # -LIBCODECS_OBJECTS= \ +LIBWSCODECS_OBJECTS= \ codecs.obj \ G711udecode.obj \ G711adecode.obj \ @@ -33,21 +33,21 @@ LIBCODECS_OBJECTS= \ resample.obj \ sbc.obj -libcodecs_LIBS = \ +libwscodecs_LIBS = \ $(GLIB_LIBS) \ ..\wsutil\libwsutil.lib libwscodecs.lib: libwscodecs.dll libwscodecs.exp: libwscodecs.dll -libwscodecs.dll : $(LIBCODECS_OBJECTS) ..\image\libwscodecs.res +libwscodecs.dll : $(LIBWSCODECS_OBJECTS) ..\image\libwscodecs.res @echo Linking libwscodecs.dll $(link) $(dlllflags) $(conlibsdll) \ $(LOCAL_LDFLAGS) $(DLL_LDFLAGS) \ /OUT:libwscodecs.dll \ /IMPLIB:libwscodecs.lib \ ..\image\libwscodecs.res \ - $(LIBCODECS_OBJECTS) $(libcodecs_LIBS) + $(LIBWSCODECS_OBJECTS) $(libwscodecs_LIBS) codecs.obj: codecs.c codecs.h $(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 clean: - rm -f $(LIBCODECS_OBJECTS) \ + rm -f $(LIBWSCODECS_OBJECTS) \ libwscodecs.lib \ libwscodecs.exp \ libwscodecs.dll \ @@ -84,4 +84,4 @@ maintainer-clean: distclean checkapi: $(PERL) ../tools/checkAPIs.pl -g abort -g termoutput -build \ - $(LIBCODECS_SRC) + $(LIBWSCODECS_SRC) -- cgit v1.2.3