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 /epan/nghttp2 | |
| 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 'epan/nghttp2')
| -rw-r--r-- | epan/nghttp2/Makefile.am | 34 | ||||
| -rw-r--r-- | epan/nghttp2/Makefile.common | 56 |
2 files changed, 23 insertions, 67 deletions
diff --git a/epan/nghttp2/Makefile.am b/epan/nghttp2/Makefile.am index 0845718d99..d5b8323b0d 100644 --- a/epan/nghttp2/Makefile.am +++ b/epan/nghttp2/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 = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBNGHTTP2_CFLAGS) \ @@ -27,6 +26,29 @@ AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(LIBNGHTTP2_CFLAGS) \ noinst_LTLIBRARIES = libnghttp2.la +libnghttp2_la_SOURCES = \ + nghttp2_buf.c \ + nghttp2_hd.c \ + nghttp2_hd_huffman.c \ + nghttp2_hd_huffman_data.c \ + nghttp2_helper.c \ + nghttp2_mem.c \ + nghttp2_rcbuf.c \ + nghttp2_buf.h \ + nghttp2_hd.h \ + nghttp2_hd_huffman.h \ + nghttp2_helper.h \ + nghttp2_int.h \ + nghttp2_mem.h \ + nghttp2_rcbuf.h \ + nghttp2.h \ + nghttp2ver.h + +EXTRA_DIST = \ + .editorconfig \ + README.nghttp2 \ + CMakeLists.txt + CLEANFILES = \ libnghttp2.a \ libnghttp2.la \ @@ -37,16 +59,6 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = \ Makefile.in -libnghttp2_la_SOURCES = \ - $(LIBNGHTTP2_SRC) \ - $(LIBNGHTTP2_INCLUDES) - -EXTRA_DIST = \ - .editorconfig \ - Makefile.common \ - README.nghttp2 \ - CMakeLists.txt - # # Editor modelines - https://www.wireshark.org/tools/modelines.html # diff --git a/epan/nghttp2/Makefile.common b/epan/nghttp2/Makefile.common deleted file mode 100644 index 277993be72..0000000000 --- a/epan/nghttp2/Makefile.common +++ /dev/null @@ -1,56 +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. - -LIBNGHTTP2_SRC = \ - nghttp2_buf.c \ - nghttp2_hd.c \ - nghttp2_hd_huffman.c \ - nghttp2_hd_huffman_data.c \ - nghttp2_helper.c \ - nghttp2_mem.c \ - nghttp2_rcbuf.c - -LIBNGHTTP2_INCLUDES = \ - nghttp2_buf.h \ - nghttp2_hd.h \ - nghttp2_hd_huffman.h \ - nghttp2_helper.h \ - nghttp2_int.h \ - nghttp2_mem.h \ - nghttp2_rcbuf.h \ - nghttp2.h \ - nghttp2ver.h - - -# -# Editor modelines - https://www.wireshark.org/tools/modelines.html -# -# Local variables: -# c-basic-offset: 8 -# tab-width: 8 -# indent-tabs-mode: t -# End: -# -# vi: set shiftwidth=8 tabstop=8 noexpandtab: -# :indentSize=8:tabSize=8:noTabs=false: -# |