diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-12-17 12:44:50 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-12-17 13:34:38 +0000 |
| commit | c9f54aa1c3a71c330c30ebc7a178922d179f912e (patch) | |
| tree | 621d5571369abca046bd8cc21e31a7b02f87dc7a /plugins | |
| parent | 6159c2be18429e69096645946a2cbb507d49cbc5 (diff) | |
autotools: Fixup plugins Custom.*.example
plugin_ldadd was removed in 262a84c384353b2a88a6e81cdc499ab94a8316c2.
Change-Id: I516aa1be3466433bf8db83ab3d1773bf88082e8c
Reviewed-on: https://code.wireshark.org/review/24850
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Custom.m4.example | 2 | ||||
| -rw-r--r-- | plugins/Custom.make.example | 3 | ||||
| -rw-r--r-- | plugins/Makefile.am | 31 |
3 files changed, 17 insertions, 19 deletions
diff --git a/plugins/Custom.m4.example b/plugins/Custom.m4.example index a124cb525e..34bb80a4c3 100644 --- a/plugins/Custom.m4.example +++ b/plugins/Custom.m4.example @@ -1,3 +1,3 @@ # -m4_define([_CUSTOM_AC_OUTPUT_], [plugins/foo/Makefile]) +m4_define([_CUSTOM_PLUGIN_CONFIG_FILES_], [plugins/foo/Makefile]) diff --git a/plugins/Custom.make.example b/plugins/Custom.make.example index dec58c8288..d17d062bc5 100644 --- a/plugins/Custom.make.example +++ b/plugins/Custom.make.example @@ -6,6 +6,3 @@ _CUSTOM_SUBDIRS_ = \ _CUSTOM_EXTRA_DIST_ = \ Custom.m4 \ Custom.make - -_CUSTOM_plugin_ldadd_ = \ - -dlopen plugins/foo/foo.la diff --git a/plugins/Makefile.am b/plugins/Makefile.am index a914a15f37..481cc29f17 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -21,25 +21,26 @@ -include Custom.make -SUBDIRS = $(_CUSTOM_SUBDIRS_) \ - docsis \ - ethercat \ - gryphon \ - irda \ - mate \ - opcua \ - profinet \ - stats_tree \ - transum \ - unistim \ - wimax \ - wimaxasncp \ +SUBDIRS = \ + $(_CUSTOM_SUBDIRS_) \ + docsis \ + ethercat \ + gryphon \ + irda \ + mate \ + opcua \ + profinet \ + stats_tree \ + transum \ + unistim \ + wimax \ + wimaxasncp \ wimaxmacphy EXTRA_DIST = \ $(_CUSTOM_EXTRA_DIST_) \ - Custom.make.example \ - Custom.m4.example \ + Custom.make.example \ + Custom.m4.example \ plugin.rc.in checkapi: |