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/crypt | |
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 'epan/crypt')
-rw-r--r-- | epan/crypt/Makefile.am | 37 | ||||
-rw-r--r-- | epan/crypt/Makefile.common | 43 |
2 files changed, 25 insertions, 55 deletions
diff --git a/epan/crypt/Makefile.am b/epan/crypt/Makefile.am index 60a8a2b291..b7f2a36556 100644 --- a/epan/crypt/Makefile.am +++ b/epan/crypt/Makefile.am @@ -19,13 +19,36 @@ # 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) noinst_LTLIBRARIES = libairpdcap.la +include Custom.common + +libairpdcap_la_SOURCES = \ + airpdcap.c \ + airpdcap_ccmp.c \ + airpdcap_debug.c \ + airpdcap_rijndael.c \ + airpdcap_tkip.c \ + airpdcap_debug.h \ + airpdcap_interop.h \ + airpdcap_int.h \ + airpdcap_rijndael.h \ + airpdcap_system.h \ + airpdcap_user.h \ + airpdcap_ws.h \ + kasumi.h \ + wep-wpadefs.h \ + $(CUSTOM_CRYPTO_SRC) + +EXTRA_DIST = \ + Custom.common \ + CMakeLists.txt \ + CMakeListsCustom.txt.example + CLEANFILES = \ libairpdcap.a \ libairpdcap.la \ @@ -36,17 +59,7 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = \ Makefile.in -libairpdcap_la_SOURCES = \ - $(LIBAIRPDCAP_SRC) \ - $(LIBAIRPDCAP_INCLUDES) - -EXTRA_DIST = \ - Custom.common \ - Makefile.common \ - CMakeLists.txt \ - CMakeListsCustom.txt.example - checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ -sourcedir=$(srcdir) \ - $(LIBAIRPDCAP_SRC) + $(libairpdcap_la_SOURCES) diff --git a/epan/crypt/Makefile.common b/epan/crypt/Makefile.common deleted file mode 100644 index 18e8edee5d..0000000000 --- a/epan/crypt/Makefile.common +++ /dev/null @@ -1,43 +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. - -include Custom.common - -LIBAIRPDCAP_SRC = \ - airpdcap.c \ - airpdcap_ccmp.c \ - airpdcap_debug.c \ - airpdcap_rijndael.c \ - airpdcap_tkip.c \ - $(CUSTOM_CRYPTO_SRC) - -LIBAIRPDCAP_INCLUDES = \ - airpdcap_debug.h \ - airpdcap_interop.h \ - airpdcap_int.h \ - airpdcap_rijndael.h \ - airpdcap_system.h \ - airpdcap_user.h \ - airpdcap_ws.h \ - kasumi.h \ - wep-wpadefs.h |