diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-06-21 05:06:23 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-06-30 11:04:17 +0000 |
| commit | a16d401b25c85ffb7fde6c46b51cb7048112f885 (patch) | |
| tree | 71ba692edcdb6f2a10ed566e18bcfbbc456cfad1 /codecs | |
| parent | f6c5cf953212248cbc680ef0d9b2f852cbfdb951 (diff) | |
| download | wireshark-a16d401b25c85ffb7fde6c46b51cb7048112f885.tar.gz | |
Remove Makefile.common files
Now that nmake build system has been removed they are not needed anymore.
Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/Makefile.am | 18 | ||||
| -rw-r--r-- | codecs/Makefile.common | 29 |
2 files changed, 10 insertions, 37 deletions
diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 591b75dd48..da74a8d87f 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -19,7 +19,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include Makefile.common include $(top_srcdir)/Makefile.am.inc AM_CPPFLAGS = -DWS_BUILD_DLL $(INCLUDEDIRS) $(WS_CPPFLAGS) \ @@ -27,13 +26,17 @@ AM_CPPFLAGS = -DWS_BUILD_DLL $(INCLUDEDIRS) $(WS_CPPFLAGS) \ lib_LTLIBRARIES = libwscodecs.la -if HAVE_SBC -LIBWSCODECS_SRC += sbc/sbc.c -endif - # All sources that should be put in the source distribution tarball libwscodecs_la_SOURCES = \ - $(LIBWSCODECS_SRC) + codecs.c \ + G711a/G711adecode.c \ + G711u/G711udecode.c \ + G722/G722decode.c \ + G726/G726decode.c + +if HAVE_SBC +libwscodecs_la_SOURCES += sbc/sbc.c +endif if !HAVE_SPEEXDSP libwscodecs_la_SOURCES += speex/resample.c @@ -61,7 +64,6 @@ noinst_HEADERS = \ EXTRA_DIST = \ CMakeLists.txt \ - Makefile.common \ speex/README.txt CLEANFILES = \ @@ -74,4 +76,4 @@ MAINTAINERCLEANFILES = \ checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g abort -g termoutput -build \ -sourcedir=$(srcdir) \ - $(LIBWSCODECS_SRC) + $(libwscodecs_la_SOURCES) diff --git a/codecs/Makefile.common b/codecs/Makefile.common deleted file mode 100644 index 1e8b158df2..0000000000 --- a/codecs/Makefile.common +++ /dev/null @@ -1,29 +0,0 @@ -# Makefile.common -# Contains the stuff from Makefile.am and Makefile.nmake that is -# a) common to both files and -# b) portable between both files -# -# Wireshark - Network traffic analyzer -# By Gerald Combs <gerald@wireshark.org> -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -LIBWSCODECS_SRC = \ - codecs.c \ - G711a/G711adecode.c \ - G711u/G711udecode.c \ - G722/G722decode.c \ - G726/G726decode.c |