diff options
Diffstat (limited to 'epan/dissectors/asn1/ess')
| -rw-r--r-- | epan/dissectors/asn1/ess/Makefile.am | 39 | ||||
| -rw-r--r-- | epan/dissectors/asn1/ess/Makefile.common | 54 |
2 files changed, 36 insertions, 57 deletions
diff --git a/epan/dissectors/asn1/ess/Makefile.am b/epan/dissectors/asn1/ess/Makefile.am index 11932c53a4..b03903c01d 100644 --- a/epan/dissectors/asn1/ess/Makefile.am +++ b/epan/dissectors/asn1/ess/Makefile.am @@ -16,7 +16,40 @@ # 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=ess + +EXT_ASN_FILE_LIST = + +ASN_FILE_LIST = \ + ExtendedSecurityServices.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 -k -C + +EXTRA_CNF= \ + $(builddir)/../cms/cms-exp.cnf \ + $(builddir)/../x509af/x509af-exp.cnf \ + $(builddir)/../x509ce/x509ce-exp.cnf + +$(builddir)/../cms/cms-exp.cnf: + (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT)) + +$(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/ess/Makefile.common b/epan/dissectors/asn1/ess/Makefile.common deleted file mode 100644 index 3b9f3c5e76..0000000000 --- a/epan/dissectors/asn1/ess/Makefile.common +++ /dev/null @@ -1,54 +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=ess - -EXT_ASN_FILE_LIST = - -ASN_FILE_LIST = \ - ExtendedSecurityServices.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 -k -C - -EXTRA_CNF= \ - $(builddir)/../cms/cms-exp.cnf \ - $(builddir)/../x509af/x509af-exp.cnf \ - $(builddir)/../x509ce/x509ce-exp.cnf - -$(builddir)/../cms/cms-exp.cnf: - (cd $(builddir)/../cms && $(MAKE_CNF_EXPORT)) - -$(builddir)/../x509af/x509af-exp.cnf: - (cd $(builddir)/../x509af && $(MAKE_CNF_EXPORT)) - -$(builddir)/../x509ce/x509ce-exp.cnf: - (cd $(builddir)/../x509ce && $(MAKE_CNF_EXPORT)) |