diff options
author | Anders Broman <anders.broman@ericsson.com> | 2011-05-25 14:21:42 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2011-05-25 14:21:42 +0000 |
commit | 84a22ed17eef0f8295fdcd00a9e054e7d97f090b (patch) | |
tree | 632a8a33b127b3ce4453278a676ad19625b5ce32 | |
parent | 07cd05fa52a2fc1a1b47b44931df3a4a981379f5 (diff) |
Make it easier to add custom asn1 dissectors.
svn path=/trunk/; revision=37393
-rw-r--r-- | asn1/Custom.make | 26 | ||||
-rw-r--r-- | asn1/Makefile.am | 5 | ||||
-rw-r--r-- | configure.in | 4 |
3 files changed, 34 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 diff --git a/configure.in b/configure.in index 2928912a09..5e607fc21f 100644 --- a/configure.in +++ b/configure.in @@ -1902,11 +1902,15 @@ AC_CACHE_SAVE sinclude(plugins/Custom.m4) dnl ifdef(_CUSTOM_AC_OUTPUT_,, define(_CUSTOM_AC_OUTPUT_, )) dnl +sinclude(plugins/Custom.m4) dnl +ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl + AM_CONFIG_HEADER(config.h) AC_OUTPUT( Makefile doxygen.cfg asn1/Makefile + _CUSTOM_ASN1_AC_OUTPUT_ asn1/acp133/Makefile asn1/acse/Makefile asn1/ansi_map/Makefile |