From 8e0a9dc8bac4d066a48a79f7a399a928bc0cdb1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Thu, 12 May 2016 13:26:42 +0100 Subject: codecs: Move noinst_HEADERS to Makefile.am MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's not common code and because it is only required for make dist placing it in Makefile.am provides better automake readability. Also noinst_HEADERS is not necessary in _SOURCES. Change-Id: I5269b79b62141efbc3151e69c5584643e5ebec47 Reviewed-on: https://code.wireshark.org/review/15399 Reviewed-by: João Valverde --- codecs/Makefile.am | 16 ++++++++++++++-- codecs/Makefile.common | 11 ----------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'codecs') diff --git a/codecs/Makefile.am b/codecs/Makefile.am index 0505d3c295..fd93ba4eda 100644 --- a/codecs/Makefile.am +++ b/codecs/Makefile.am @@ -33,8 +33,7 @@ endif # All sources that should be put in the source distribution tarball libwscodecs_la_SOURCES = \ - $(LIBWSCODECS_SRC) \ - $(noinst_HEADERS) + $(LIBWSCODECS_SRC) # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html libwscodecs_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ @@ -43,6 +42,19 @@ libwscodecs_la_LIBADD = $(top_builddir)/wsutil/libwsutil.la $(GLIB_LIBS) $(SBC_L libwscodecs_la_DEPENDENCIES = $(top_builddir)/wsutil/libwsutil.la +noinst_HEADERS = \ + codecs.h \ + G711a/G711adecode.h \ + G711a/G711atable.h \ + G711u/G711udecode.h \ + G711u/G711utable.h \ + G722/G722decode.h \ + G726/G726decode.h \ + sbc/sbc_private.h \ + speex/arch.h \ + speex/speex_resampler.h \ + speex/stack_alloc.h + EXTRA_DIST = \ CMakeLists.txt \ Makefile.common \ diff --git a/codecs/Makefile.common b/codecs/Makefile.common index a4163abfb4..b97e7f8dbc 100644 --- a/codecs/Makefile.common +++ b/codecs/Makefile.common @@ -28,14 +28,3 @@ LIBWSCODECS_SRC = \ G722/G722decode.c \ G726/G726decode.c \ speex/resample.c - -noinst_HEADERS = \ - codecs.h \ - G711a/G711adecode.h G711a/G711atable.h \ - G711u/G711udecode.h G711u/G711utable.h \ - G722/G722decode.h \ - G726/G726decode.h \ - sbc/sbc_private.h \ - speex/arch.h \ - speex/speex_resampler.h \ - speex/stack_alloc.h -- cgit v1.2.3