From 7a588676268b322230ff22a781b1ebcb4cd322fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Tue, 7 May 2013 12:58:27 +0000 Subject: x721 and kerberos: Use standard Makefile.am idmp: remove an unused line tetra, h460: Whitespace changes to be a "standard" Makefile.am asn1/Makefile.am: don't try to build kerberos and x721 dissectors svn path=/trunk/; revision=49201 --- asn1/Makefile.am | 8 ++++++-- asn1/h460/Makefile.am | 4 +++- asn1/idmp/Makefile.common | 2 -- asn1/kerberos/Makefile.am | 3 +-- asn1/tetra/Makefile.am | 1 + asn1/x721/Makefile.am | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-) (limited to 'asn1') diff --git a/asn1/Makefile.am b/asn1/Makefile.am index e6c02181e9..245e3f4e21 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -64,7 +64,6 @@ SUBDIRS = \ idmp \ inap \ isdn-sup \ - kerberos \ lcsap \ ldap \ logotypecertextn \ @@ -122,7 +121,12 @@ SUBDIRS = \ x509af \ x509ce \ x509if \ - x509sat \ + x509sat + +# kerberos is a handwritten dissector, don't replace +# x721 doesn't build +DONT_BUILD_SUBDIRS = \ + kerberos \ x721 EXTRA_DIST = \ diff --git a/asn1/h460/Makefile.am b/asn1/h460/Makefile.am index 43e4636f78..d357a4d4df 100644 --- a/asn1/h460/Makefile.am +++ b/asn1/h460/Makefile.am @@ -1,5 +1,6 @@ # $Id$ # +# # Wireshark - Network traffic analyzer # By Gerald Combs # Copyright 1998 Gerald Combs @@ -17,8 +18,9 @@ # 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 ../Makefile.preinc include Makefile.common include ../Makefile.inc + diff --git a/asn1/idmp/Makefile.common b/asn1/idmp/Makefile.common index 142c7375b9..56ea58a1b3 100644 --- a/asn1/idmp/Makefile.common +++ b/asn1/idmp/Makefile.common @@ -22,8 +22,6 @@ PROTOCOL_NAME=idmp -NEED_PACKET_PROTO_H = 1 - EXPORT_FILES = \ $(PROTOCOL_NAME)-exp.cnf diff --git a/asn1/kerberos/Makefile.am b/asn1/kerberos/Makefile.am index bee9844028..d357a4d4df 100644 --- a/asn1/kerberos/Makefile.am +++ b/asn1/kerberos/Makefile.am @@ -22,6 +22,5 @@ include ../Makefile.preinc include Makefile.common -# Comment this out to allow 'make all' to work -#include ../Makefile.inc +include ../Makefile.inc diff --git a/asn1/tetra/Makefile.am b/asn1/tetra/Makefile.am index b3289801b2..d357a4d4df 100644 --- a/asn1/tetra/Makefile.am +++ b/asn1/tetra/Makefile.am @@ -23,3 +23,4 @@ include ../Makefile.preinc include Makefile.common include ../Makefile.inc + diff --git a/asn1/x721/Makefile.am b/asn1/x721/Makefile.am index 3fce7917c4..d357a4d4df 100644 --- a/asn1/x721/Makefile.am +++ b/asn1/x721/Makefile.am @@ -19,8 +19,8 @@ # 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 -# Comment this out to allow 'make all' to work -#include ../Makefile.inc +include ../Makefile.inc -- cgit v1.2.3