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/dissectors/asn1/ocsp | |
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/dissectors/asn1/ocsp')
-rw-r--r-- | epan/dissectors/asn1/ocsp/Makefile.am | 35 | ||||
-rw-r--r-- | epan/dissectors/asn1/ocsp/Makefile.common | 50 |
2 files changed, 32 insertions, 53 deletions
diff --git a/epan/dissectors/asn1/ocsp/Makefile.am b/epan/dissectors/asn1/ocsp/Makefile.am index 11932c53a4..ce7d39d0a9 100644 --- a/epan/dissectors/asn1/ocsp/Makefile.am +++ b/epan/dissectors/asn1/ocsp/Makefile.am @@ -16,7 +16,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.preinc -include Makefile.common include ../Makefile.inc + +PROTOCOL_NAME=ocsp + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = \ + OCSP.asn + +# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn +# files do not exist for all protocols: Please add/remove as required. +EXTRA_DIST = \ + $(EXTRA_DIST_COMMON) \ + $(ASN_FILE_LIST) \ + packet-$(PROTOCOL_NAME)-template.c \ + packet-$(PROTOCOL_NAME)-template.h \ + $(PROTOCOL_NAME).cnf + +SRC_FILES = \ + $(EXTRA_DIST) \ + $(EXT_ASN_FILE_LIST) + +A2W_FLAGS= -b + +EXTRA_CNF= \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf + +$(builddir)/../x509af/x509af-exp.cnf: + (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) + +$(builddir)/../x509ce/x509ce-exp.cnf: + (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) diff --git a/epan/dissectors/asn1/ocsp/Makefile.common b/epan/dissectors/asn1/ocsp/Makefile.common deleted file mode 100644 index fa22e9149b..0000000000 --- a/epan/dissectors/asn1/ocsp/Makefile.common +++ /dev/null @@ -1,50 +0,0 @@ -# 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. - - -PROTOCOL_NAME=ocsp - -EXT_ASN_FILE_LIST = - -ASN_FILE_LIST = \ - OCSP.asn - -# The packet-$(PROTOCOL_NAME)-template.h and $(PROTOCOL_NAME).asn -# files do not exist for all protocols: Please add/remove as required. -EXTRA_DIST = \ - $(EXTRA_DIST_COMMON) \ - $(ASN_FILE_LIST) \ - packet-$(PROTOCOL_NAME)-template.c \ - packet-$(PROTOCOL_NAME)-template.h \ - $(PROTOCOL_NAME).cnf - -SRC_FILES = \ - $(EXTRA_DIST) \ - $(EXT_ASN_FILE_LIST) - -A2W_FLAGS= -b - -EXTRA_CNF= \ - $(builddir)/../x509af/x509af-exp.cnf \ - $(builddir)/../x509ce/x509ce-exp.cnf - -$(builddir)/../x509af/x509af-exp.cnf: - (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) - -$(builddir)/../x509ce/x509ce-exp.cnf: - (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) |