aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-25 14:21:42 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2011-05-25 14:21:42 +0000
commit87150332c001281e8574709055555e150dfaa599 (patch)
tree632a8a33b127b3ce4453278a676ad19625b5ce32 /asn1
parentb058c53f2cf537c8be0cbbcc654b3218be3ebb84 (diff)
Make it easier to add custom asn1 dissectors.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37393 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'asn1')
-rw-r--r--asn1/Custom.make26
-rw-r--r--asn1/Makefile.am5
2 files changed, 30 insertions, 1 deletions
diff --git a/asn1/Custom.make b/asn1/Custom.make
new file mode 100644
index 0000000000..3a727bef6a
--- /dev/null
+++ b/asn1/Custom.make
@@ -0,0 +1,26 @@
+# Automake file for Wireshark
+#
+# $Id$
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 2006 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Add custom asn1 directories here, the file is included by Makefile.am
+# Note you need to add a Cutom.m4 file too.
+#
+CUSTOM_SUBDIRS = \ \ No newline at end of file
diff --git a/asn1/Makefile.am b/asn1/Makefile.am
index c5513af330..9339e69b02 100644
--- a/asn1/Makefile.am
+++ b/asn1/Makefile.am
@@ -21,8 +21,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+include Custom.make
SUBDIRS = \
+ $(CUSTOM_SUBDIRS) \
acp133 \
acse \
ansi_map \
@@ -116,7 +118,8 @@ SUBDIRS = \
EXTRA_DIST = \
Makefile.nmake \
Makefile.inc.nmake \
- Makefile.preinc.nmake
+ Makefile.preinc.nmake \
+ Custom.make
MAINTAINERCLEANFILES = \
Makefile.in