summaryrefslogtreecommitdiff
path: root/asn1/x721
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2013-05-07 12:58:27 +0000
committerJörg Mayer <jmayer@loplof.de>2013-05-07 12:58:27 +0000
commit7a588676268b322230ff22a781b1ebcb4cd322fa (patch)
tree42263d0c6b88b94d2d6888ba20c2709198cf307f /asn1/x721
parent483d9d74ab86952117027bd1d987cd5bd204260d (diff)
downloadwireshark-7a588676268b322230ff22a781b1ebcb4cd322fa.tar.gz
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
Diffstat (limited to 'asn1/x721')
-rw-r--r--asn1/x721/Makefile.am4
1 files changed, 2 insertions, 2 deletions
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