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 /randpkt_core | |
| parent | f6c5cf953212248cbc680ef0d9b2f852cbfdb951 (diff) | |
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 'randpkt_core')
| -rw-r--r-- | randpkt_core/Makefile.am | 12 | ||||
| -rw-r--r-- | randpkt_core/Makefile.common | 28 |
2 files changed, 5 insertions, 35 deletions
diff --git a/randpkt_core/Makefile.am b/randpkt_core/Makefile.am index 5f8456784d..d46b9be4b4 100644 --- a/randpkt_core/Makefile.am +++ b/randpkt_core/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) $(GLIB_CFLAGS) @@ -37,8 +36,8 @@ MAINTAINERCLEANFILES = \ # All sources that should be put in the source distribution tarball librandpkt_core_a_SOURCES = \ - $(RANDPKT_CORE_SRC) \ - $(noinst_HEADERS) + randpkt_core.c \ + randpkt_core.h librandpkt_core_a_DEPENDENCIES = @@ -57,15 +56,14 @@ checkapi: checkapi-base checkapi-todo checkapi-base: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g deprecated-gtk -build \ -sourcedir=$(srcdir) \ - $(RANDPKT_CORE_SRC) + $(librandpkt_core_a_SOURCES) checkapi-todo: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -M -g deprecated-gtk-todo -build \ -sourcedir=$(srcdir) \ - $(RANDPKT_CORE_SRC) + $(librandpkt_core_a_SOURCES) EXTRA_DIST = \ $(GENERATOR_FILES) \ CMakeLists.txt \ - doxygen.cfg.in \ - Makefile.common + doxygen.cfg.in diff --git a/randpkt_core/Makefile.common b/randpkt_core/Makefile.common deleted file mode 100644 index b7f72fc4c4..0000000000 --- a/randpkt_core/Makefile.common +++ /dev/null @@ -1,28 +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. - -RANDPKT_CORE_SRC = \ - randpkt_core.c - -noinst_HEADERS = \ - randpkt_core.h |