diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-10-30 19:45:40 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-10-30 19:45:40 +0000 |
| commit | 5d960bbf029cd7e1b8fc1b61b201f346071846b5 (patch) | |
| tree | e6ce2196b38fa2ce9a9d55d11b2fe70f2fa2addb | |
| parent | da15667cd3b232edacfe22d1bb4a62123f7c489f (diff) | |
From Marc Moussali:
Make it easier to add custom plugins.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26627 f5534014-38df-0310-8fa8-9805f1628bb7
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/Makefile.am | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 0800e13a1f..7e3e1fa5a4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -238,8 +238,8 @@ wimaxasncp_DATA = \ PLATFORM_SRC = capture-pcap-util-unix.c if HAVE_PLUGINS - -plugin_ldadd = \ +-include plugins/Custom.make +plugin_ldadd = $(_CUSTOM_plugin_ldadd_) \ -dlopen plugins/agentx/agentx.la \ -dlopen plugins/artnet/artnet.la \ -dlopen plugins/asn1/asn1.la \ diff --git a/configure.in b/configure.in index 1d6d9c237d..d0012eb769 100644 --- a/configure.in +++ b/configure.in @@ -1558,6 +1558,9 @@ AC_SUBST(ENABLE_STATIC) dnl Save the cacheable configure results to config.cache before recursing AC_CACHE_SAVE +sinclude(plugins/Custom.m4) dnl +ifdef(_CUSTOM_AC_OUTPUT_, '', define(_CUSTOM_AC_OUTPUT_, )) dnl + AM_CONFIG_HEADER(config.h) AC_OUTPUT( Makefile @@ -1697,6 +1700,7 @@ AC_OUTPUT( tools/lemon/Makefile wiretap/Makefile wsutil/Makefile + _CUSTOM_AC_OUTPUT_ ,) dnl AC_CONFIG_FILES([tools/setuid-root.pl], [chmod +x tools/setuid-root.pl]) diff --git a/epan/Makefile.am b/epan/Makefile.am index a214e95f7c..e87f2bb803 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -185,7 +185,7 @@ inet_pton.c: if HAVE_PLUGINS if ENABLE_STATIC - +-include ../plugins/Custom.make plugin_src = \ ../plugins/artnet/packet-artnet.c \ ../plugins/asn1/packet-asn1.c \ diff --git a/plugins/Makefile.am b/plugins/Makefile.am index ea89c35b9c..c409925642 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -21,7 +21,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -SUBDIRS = \ +-include Custom.make +SUBDIRS = $(_CUSTOM_SUBDIRS_) \ agentx \ artnet \ asn1 \ |