From eac5ba60f1318ceba9c70f6d894d866e3a48c73a Mon Sep 17 00:00:00 2001
From: Boris Yakobowski <boris.yakobowski@cea.fr>
Date: Thu, 30 Mar 2017 14:38:51 +0200
Subject: [PATCH] [Makefile] remove occurrences of DYNAMIC
---
Makefile | 15 ---------
configure.in | 39 ++++++++++-------------
doc/developer/advance.tex | 1 -
share/Makefile.config.in | 17 ----------
share/Makefile.dynamic | 13 +-------
share/Makefile.plugin.template | 40 ------------------------
share/configure.ac | 10 ++----
src/plugins/aorai/Makefile.in | 1 -
src/plugins/loop_analysis/Makefile.in | 1 -
src/plugins/nonterm/Makefile.in | 1 -
src/plugins/obfuscator/Makefile.in | 1 -
src/plugins/report/Makefile.in | 1 -
src/plugins/security_slicing/Makefile.in | 1 -
src/plugins/variadic/Makefile.in | 1 -
src/plugins/wp/Makefile.in | 1 -
15 files changed, 20 insertions(+), 123 deletions(-)
diff --git a/Makefile b/Makefile
index a1402a66e7c..2275b8f7167 100644
--- a/Makefile
+++ b/Makefile
@@ -645,7 +645,6 @@ SINGLE_GUI_CMO:= $(patsubst %,src/plugins/gui/%.cmo,$(SINGLE_GUI_CMO))
###########
PLUGIN_ENABLE:=$(ENABLE_METRICS)
-PLUGIN_DYNAMIC:=$(DYNAMIC_METRICS)
PLUGIN_NAME:=Metrics
PLUGIN_DISTRIBUTED:=yes
PLUGIN_DIR:=src/plugins/metrics
@@ -662,7 +661,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
#############
PLUGIN_ENABLE:=$(ENABLE_CALLGRAPH)
-PLUGIN_DYNAMIC:=$(DYNAMIC_CALLGRAPH)
PLUGIN_NAME:=Callgraph
PLUGIN_DISTRIBUTED:=yes
PLUGIN_DIR:=src/plugins/callgraph
@@ -679,7 +677,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
##################
PLUGIN_ENABLE:=$(ENABLE_VALUE_ANALYSIS)
-PLUGIN_DYNAMIC:=$(DYNAMIC_VALUE_ANALYSIS)
PLUGIN_NAME:=Value
PLUGIN_DIR:=src/plugins/value
PLUGIN_EXTRA_DIRS:=engine values domains domains/cvalue domains/apron \
@@ -762,7 +759,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
##################
PLUGIN_ENABLE:=$(ENABLE_OCCURRENCE)
-PLUGIN_DYNAMIC:=$(DYNAMIC_OCCURRENCE)
PLUGIN_NAME:=Occurrence
PLUGIN_DISTRIBUTED:=yes
PLUGIN_DIR:=src/plugins/occurrence
@@ -778,7 +774,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
################################################
PLUGIN_ENABLE:=$(ENABLE_RTEGEN)
-PLUGIN_DYNAMIC:=$(DYNAMIC_RTEGEN)
PLUGIN_NAME:=RteGen
PLUGIN_DIR:=src/plugins/rte
PLUGIN_CMO:= options generator rte visit register
@@ -792,7 +787,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
#################
PLUGIN_ENABLE:=$(ENABLE_FROM_ANALYSIS)
-PLUGIN_DYNAMIC:=$(DYNAMIC_FROM_ANALYSIS)
PLUGIN_NAME:=From
PLUGIN_DIR:=src/plugins/from
PLUGIN_CMO:= from_parameters from_compute \
@@ -813,7 +807,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
##################
PLUGIN_ENABLE:=$(ENABLE_USERS)
-PLUGIN_DYNAMIC:=$(DYNAMIC_USERS)
PLUGIN_NAME:=Users
PLUGIN_DIR:=src/plugins/users
PLUGIN_CMO:= users_register
@@ -829,7 +822,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
########################
PLUGIN_ENABLE:=$(ENABLE_CONSTANT_PROPAGATION)
-PLUGIN_DYNAMIC:=$(DYNAMIC_CONSTANT_PROPAGATION)
PLUGIN_NAME:=Constant_Propagation
PLUGIN_DIR:=src/plugins/constant_propagation
PLUGIN_CMO:= propagationParameters \
@@ -845,7 +837,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
###################
PLUGIN_ENABLE:=$(ENABLE_POSTDOMINATORS)
-PLUGIN_DYNAMIC:=$(DYNAMIC_POSTDOMINATORS)
PLUGIN_NAME:=Postdominators
PLUGIN_DIR:=src/plugins/postdominators
PLUGIN_CMO:= postdominators_parameters print compute
@@ -859,7 +850,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
#########
PLUGIN_ENABLE:=$(ENABLE_INOUT)
-PLUGIN_DYNAMIC:=$(DYNAMIC_INOUT)
PLUGIN_NAME:=Inout
PLUGIN_DIR:=src/plugins/inout
PLUGIN_CMO:= inout_parameters cumulative_analysis \
@@ -879,7 +869,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
###################
PLUGIN_ENABLE:=$(ENABLE_IMPACT)
-PLUGIN_DYNAMIC:=$(DYNAMIC_IMPACT)
PLUGIN_NAME:=Impact
PLUGIN_DIR:=src/plugins/impact
PLUGIN_CMO:= options pdg_aux reason_graph compute_impact register
@@ -896,7 +885,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
##################################
PLUGIN_ENABLE:=$(ENABLE_PDG)
-PLUGIN_DYNAMIC:=$(DYNAMIC_PDG)
PLUGIN_NAME:=Pdg
PLUGIN_DIR:=src/plugins/pdg
PLUGIN_CMO:= pdg_parameters \
@@ -925,7 +913,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
################################################
PLUGIN_ENABLE:=$(ENABLE_SCOPE)
-PLUGIN_DYNAMIC:=$(DYNAMIC_SCOPE)
PLUGIN_NAME:=Scope
PLUGIN_DIR:=src/plugins/scope
PLUGIN_CMO:= datascope zones defs
@@ -941,7 +928,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
#####################################
PLUGIN_ENABLE:=$(ENABLE_SPARECODE)
-PLUGIN_DYNAMIC:=$(DYNAMIC_SPARECODE)
PLUGIN_NAME:=Sparecode
PLUGIN_DIR:=src/plugins/sparecode
PLUGIN_CMO:= sparecode_params globs spare_marks transform register
@@ -957,7 +943,6 @@ $(eval $(call include_generic_plugin_Makefile,$(PLUGIN_NAME)))
###########
PLUGIN_ENABLE:=$(ENABLE_SLICING)
-PLUGIN_DYNAMIC:=$(DYNAMIC_SLICING)
PLUGIN_NAME:=Slicing
PLUGIN_DIR:=src/plugins/slicing
PLUGIN_CMO:= slicingParameters \
diff --git a/configure.in b/configure.in
index 4c49ad93496..116392012ce 100644
--- a/configure.in
+++ b/configure.in
@@ -622,7 +622,7 @@ PLUGINS_FORCE_LIST=
###########
check_plugin(callgraph, src/plugins/callgraph,
- [support for callgraph plugin], yes, yes)
+ [support for callgraph plugin], yes)
plugin_use_external(callgraph,dot)
plugin_use(callgraph,gui)
@@ -632,14 +632,14 @@ plugin_use(callgraph,value_analysis)
######################
check_plugin(semantic_constant_folding, src/plugins/constant_propagation,
- [support for constant propagation plugin],yes,yes)
+ [support for constant propagation plugin],yes)
plugin_require(semantic_constant_folding,value_analysis)
# from
######
-check_plugin(from_analysis,src/plugins/from,[support for from analysis],yes,yes)
+check_plugin(from_analysis,src/plugins/from,[support for from analysis],yes)
plugin_require(from_analysis,value_analysis)
plugin_require(from_analysis,callgraph)
@@ -647,7 +647,7 @@ plugin_require(from_analysis,callgraph)
# gui
#####
-check_plugin(gui,src/plugins/gui,[support for gui],yes,no)
+check_plugin(gui,src/plugins/gui,[support for gui],no)
plugin_require_external(gui,lablgtk)
plugin_require_external(gui,gnomecanvas)
@@ -657,7 +657,7 @@ plugin_use_external(gui,dot)
# impact
########
-check_plugin(impact,src/plugins/impact,[support for impact plugin],yes,yes)
+check_plugin(impact,src/plugins/impact,[support for impact plugin],yes)
plugin_use(impact,gui)
plugin_use(impact,slicing)
@@ -668,7 +668,7 @@ plugin_require(impact,inout)
# inout
#######
-check_plugin(inout,src/plugins/inout,[support for inout analysis],yes,yes)
+check_plugin(inout,src/plugins/inout,[support for inout analysis],yes)
plugin_require(inout,from_analysis)
plugin_require(inout,value_analysis)
plugin_require(inout,callgraph)
@@ -676,7 +676,7 @@ plugin_require(inout,callgraph)
# metrics
#########
-check_plugin(metrics,src/plugins/metrics,[support for metrics analysis],yes,yes)
+check_plugin(metrics,src/plugins/metrics,[support for metrics analysis],yes)
plugin_use(metrics,value_analysis)
plugin_use(metrics,gui)
@@ -684,14 +684,14 @@ plugin_use(metrics,gui)
############
check_plugin(occurrence,src/plugins/occurrence,
- [support for occurrence analysis],yes,yes)
+ [support for occurrence analysis],yes)
plugin_use(occurrence,gui)
plugin_require(occurrence,value_analysis)
# pdg
#####
-check_plugin(pdg,src/plugins/pdg,[support for pdg plugin],yes,yes,pdg_types)
+check_plugin(pdg,src/plugins/pdg,[support for pdg plugin],yes,pdg_types)
plugin_require(pdg,from_analysis)
plugin_require(pdg,value_analysis)
plugin_require(pdg,callgraph)
@@ -700,18 +700,18 @@ plugin_require(pdg,callgraph)
################
check_plugin(postdominators,src/plugins/postdominators,
- [support for postdominators plugin],yes,yes)
+ [support for postdominators plugin],yes)
# rte
#####
check_plugin(rtegen,src/plugins/rte,
- [support for runtime error annotation],yes,yes)
+ [support for runtime error annotation],yes)
# scope
############
-check_plugin(scope,src/plugins/scope,[support for scope plugin],yes,yes)
+check_plugin(scope,src/plugins/scope,[support for scope plugin],yes)
plugin_require(scope,postdominators)
plugin_require(scope,value_analysis)
plugin_require(scope,from_analysis)
@@ -721,7 +721,7 @@ plugin_use(scope,gui)
# slicing
#########
-check_plugin(slicing,src/plugins/slicing,[support for slicing plugin],yes,yes,
+check_plugin(slicing,src/plugins/slicing,[support for slicing plugin],yes,
src/slicing_types)
plugin_require(slicing,from_analysis)
plugin_require(slicing,pdg)
@@ -733,14 +733,14 @@ plugin_use(slicing,gui)
############
check_plugin(sparecode,src/plugins/sparecode,
- [support for sparecode plugin],yes,yes)
+ [support for sparecode plugin],yes)
plugin_require(sparecode,pdg)
plugin_require(sparecode,value_analysis)
# users
#######
-check_plugin(users,src/plugins/users,[support for users analysis],yes,yes)
+check_plugin(users,src/plugins/users,[support for users analysis],yes)
plugin_require(users,value_analysis)
plugin_use(users,callgraph)
@@ -748,7 +748,7 @@ plugin_use(users,callgraph)
#######
check_plugin(value_analysis,src/plugins/value,
- [support for value analysis],yes,yes)
+ [support for value analysis],yes)
plugin_use(value_analysis,gui)
plugin_use(value_analysis,scope)
plugin_use(value_analysis,callgraph)
@@ -805,7 +805,7 @@ AC_FOREACH([__plugin],m4_esyscmd([ls src/plugins]),
)
m4_if(m4_sysval,[0],,
[ check_plugin(__plugin,plugin_dir,
- [support for __plugin plug-in],yes,yes)
+ [support for __plugin plug-in],yes)
if test "$[ENABLE_]tovarname(__plugin)" != "no"; then
EXTERNAL_PLUGINS="$EXTERNAL_PLUGINS plugin_dir";
fi])])],
@@ -944,7 +944,6 @@ AC_SUBST(LABLGTK_PATH)
# Sadly AC_FOREACH is deprecated now...
AC_FOREACH([p],PLUGINS_LIST,
[AC_SUBST([ENABLE_]p)
- AC_SUBST([DYNAMIC_]p)
])
################################################
@@ -966,16 +965,12 @@ new_section "summary: plug-ins available"
for plugin in m4_flatten(PLUGINS_LIST); do
n=NAME_$plugin
e=ENABLE_$plugin
- d=DYNAMIC_$plugin
i=INFO_$plugin
eval nv=\$$n
eval ev=\$$e
- eval dv=\$$d
eval iv=\$$i
if test "$ev" = "no"; then
res=$ev;
- elif test "$dv" = "yes"; then
- res="$ev, dynamic";
else
res=$ev;
fi
diff --git a/doc/developer/advance.tex b/doc/developer/advance.tex
index 2414e2f0a2b..30131b419ff 100644
--- a/doc/developer/advance.tex
+++ b/doc/developer/advance.tex
@@ -589,7 +589,6 @@ the specific features of \texttt{Makefile.dynamic}.
%% \begin{makefilecode}
%% PLUGIN_ENABLE :=@ENABLE_LTL_TO_ACSL@
%% PLUGIN_DIR :=src/ltl_to_acsl
-%% PLUGIN_DYNAMIC :=@DYNAMIC_LTL_TO_ACSL@
%% DISTRIB_FILES += $(PLUGIN_DIR)/Makefile
%% include $(PLUGIN_DIR)/Makefile
%% \end{makefilecode}
diff --git a/share/Makefile.config.in b/share/Makefile.config.in
index 31a8a9bd3cf..f97c849ba2c 100644
--- a/share/Makefile.config.in
+++ b/share/Makefile.config.in
@@ -151,23 +151,6 @@ ENABLE_SPARECODE ?=@ENABLE_SPARECODE@
ENABLE_USERS ?=@ENABLE_USERS@
ENABLE_VALUE_ANALYSIS ?=@ENABLE_VALUE_ANALYSIS@
-DYNAMIC_CALLGRAPH ?=@DYNAMIC_CALLGRAPH@
-DYNAMIC_CONSTANT_PROPAGATION ?=@DYNAMIC_SEMANTIC_CONSTANT_FOLDING@
-DYNAMIC_FROM_ANALYSIS ?=@DYNAMIC_FROM_ANALYSIS@
-#DYNAMIC_GUI: never dynamic
-DYNAMIC_IMPACT ?=@DYNAMIC_IMPACT@
-DYNAMIC_INOUT ?=@DYNAMIC_INOUT@
-DYNAMIC_METRICS ?=@DYNAMIC_METRICS@
-DYNAMIC_OCCURRENCE ?=@DYNAMIC_OCCURRENCE@
-DYNAMIC_PDG ?=@DYNAMIC_PDG@
-DYNAMIC_POSTDOMINATORS ?=@DYNAMIC_POSTDOMINATORS@
-DYNAMIC_RTEGEN ?=@DYNAMIC_RTEGEN@
-DYNAMIC_SCOPE ?=@DYNAMIC_SCOPE@
-DYNAMIC_SLICING ?=@DYNAMIC_SLICING@
-DYNAMIC_SPARECODE ?=@DYNAMIC_SPARECODE@
-DYNAMIC_USERS ?=@DYNAMIC_USERS@
-DYNAMIC_VALUE_ANALYSIS ?=@DYNAMIC_VALUE_ANALYSIS@
-
#bytes is part of the stdlib, but is used as a transitional package.
LIBRARY_NAMES := findlib ocamlgraph num unix str dynlink bytes zarith
diff --git a/share/Makefile.dynamic b/share/Makefile.dynamic
index b6a78836d02..6bc44beb049 100644
--- a/share/Makefile.dynamic
+++ b/share/Makefile.dynamic
@@ -33,10 +33,6 @@ ifndef MAKECONFIG_DIR
MAKECONFIG_DIR :=$(FRAMAC_SHARE)
endif
-ifndef PLUGIN_DYNAMIC
-PLUGIN_DYNAMIC :=yes
-endif
-
#Do not generate documentation for this.
PLUGIN_UNDOC:=$(PLUGIN_UNDOC)
@@ -204,14 +200,7 @@ ifneq ($(FRAMAC_INTERNAL),yes)
# Clean & Install #
###################
-.PHONY: tests all install uninstall clean depend $(PLUGIN_NAME)_CLEAN_DYNAMIC
-
-clean:: $(PLUGIN_NAME)_CLEAN_DYNAMIC
-
-$(PLUGIN_NAME)_CLEAN_DYNAMIC:
- $(RM) $($(patsubst %_CLEAN_DYNAMIC,%_DIR,$@))/tests/ptests_config
- $(RM) frama-c-$($(patsubst %_CLEAN_DYNAMIC,,$@)) \
- frama-c-$($(patsubst %_CLEAN_DYNAMIC,,$@)).byte
+.PHONY: tests all install uninstall clean depend
dist-clean distclean: $(PLUGIN_DIR)/$(PLUGIN_NAME)_DIST_CLEAN
diff --git a/share/Makefile.plugin.template b/share/Makefile.plugin.template
index bc35e1754cd..a9210eb83c1 100644
--- a/share/Makefile.plugin.template
+++ b/share/Makefile.plugin.template
@@ -39,8 +39,6 @@ endif
PLUGIN_DIR?=
PLUGIN_ENABLE?= # Whether the plugin is enabled
PLUGIN_DEPENDS?= # Deprecated (static plug-in dependencies, Frama-C only)
-PLUGIN_DYNAMIC?= # Set it to yes if the plugin is only
- # dynamically linked with Frama-C.
# META file
# ---------
@@ -318,11 +316,7 @@ else
TARGET_TOP_CMXA:=
endif
-ifeq ("$(PLUGIN_DYNAMIC)","yes")
TARGET_TOP_CMXS:= $(TARGET_TOP_CMX:.cmx=.cmxs)
-else
-TARGET_TOP_CMXS:=
-endif
# The packed files for GUI mode (in directory 'gui')
ifeq ($(HAS_GUI),yes)
@@ -332,12 +326,8 @@ TARGET_GUI_CMI:= $(TARGET_GUI_CMO:.cmo=.cmi)
TARGET_GUI_CMX:= $(TARGET_GUI_CMO:.cmo=.cmx)
TARGET_GUI_CMA:= $(TARGET_GUI_CMO:.cmo=.cma)
TARGET_GUI_CMXA:= $(TARGET_GUI_CMX:.cmx=.cmxa)
-ifeq ("$(PLUGIN_DYNAMIC)","yes")
TARGET_GUI_CMXS:= $(TARGET_GUI_CMO:.cmo=.cmxs)
else
-TARGET_GUI_CMXS:=
-endif
-else
TARGET_GUI_MLI:=
TARGET_GUI_CMO:=
TARGET_GUI_CMI:=
@@ -467,9 +457,7 @@ META.$(PLUGIN_PKG).NATIVE :=@PLUGIN_NAME@.cmxa
else
META.$(PLUGIN_PKG).NATIVE :=@PLUGIN_NAME@.cmx
endif
-ifeq ("$(PLUGIN_DYNAMIC)","yes")
META.$(PLUGIN_PKG).PLUGIN :=@PLUGIN_NAME@.cmxs
-endif
ifeq ($(FRAMAC_INTERNAL),yes)
# In internal mode, we depend on the main Makefile for plugins that do not
@@ -573,14 +561,12 @@ $(TARGET_TOP_CMX): $(PLUGIN_CMX) \
$(@PLUGIN_NAME@_TARGET_OFLAGS) \
$(@PLUGIN_NAME@_CMI_ONLY) $(@PLUGIN_NAME@_CMX)
-ifeq ("$(PLUGIN_DYNAMIC)","yes")
$(TARGET_TOP_CMXS): $(TARGET_TOP_CMX) $(PLUGIN_EXTRA_OPT)
$(PRINT_PACKING) $@
$(OCAMLOPT) -o $(call winpath,$@) -shared \
$(@PLUGIN_NAME@_OFLAGS) \
$(@PLUGIN_NAME@_EXTRA_OPT) \
$(@:.cmxs=.cmx)
-endif
ifdef PLUGIN_EXTRA_BYTE
$(TARGET_TOP_CMA): $(PLUGIN_EXTRA_BYTE) $(TARGET_TOP_CMO)
@@ -631,7 +617,6 @@ $(TARGET_GUI_CMX): $(PLUGIN_GUI_CMX) $(TARGET_CMI) $(TARGET_GUI_CMI)
$(@PLUGIN_NAME@_GUI_CMI_ONLY) \
$(@PLUGIN_NAME@_GUI_CMX)
-ifeq ("$(PLUGIN_DYNAMIC)","yes")
$(TARGET_GUI_CMXS): $(TARGET_GUI_CMX)
$(PRINT_PACKING) $@
$(MKDIR) $(PLUGIN_LIB_DIR)/gui
@@ -640,7 +625,6 @@ $(TARGET_GUI_CMXS): $(TARGET_GUI_CMX)
$(@PLUGIN_NAME@_GUI_TARGET_OFLAGS) \
$(@PLUGIN_NAME@_EXTRA_OPT) \
$^
-endif
ifdef PLUGIN_EXTRA_BYTE
$(TARGET_GUI_CMA): $(PLUGIN_EXTRA_BYTE) $(TARGET_GUI_CMO)
@@ -958,7 +942,6 @@ $(PLUGIN_DIR)/@PLUGIN_NAME@_CLEAN_DOC: $(@PLUGIN_NAME@_DOC_DIR)
PLUGIN_GENERATED_LIST += $(PLUGIN_GENERATED)
-ifeq ($(PLUGIN_DYNAMIC),yes)
#dynamic plugin
PLUGIN_META_LIST += $(TARGET_META)
PLUGIN_DYN_EXISTS:=yes
@@ -991,28 +974,6 @@ ifeq ($(HAS_GUI),yes)
PLUGIN_DYN_GUI_CMX_LIST += $(TARGET_GUI_CMXS)
endif # HAS_GUI
-else # Normal plugin
-PLUGIN_LIST += $(PLUGIN_DIR)/@PLUGIN_NAME@
-ifdef PLUGIN_EXTRA_BYTE
-.PRECIOUS: $(TARGET_TOP_CMO) $(TARGET_GUI_CMO)
-PLUGIN_CMO_LIST += $(TARGET_TOP_CMA)
-PLUGIN_GUI_CMO_LIST += $(TARGET_GUI_CMA)
-else
-PLUGIN_CMO_LIST += $(TARGET_TOP_CMO)
-PLUGIN_GUI_CMO_LIST += $(TARGET_GUI_CMO)
-endif
-ifdef PLUGIN_EXTRA_OPT
-.PRECIOUS: $(TARGET_TOP_CMX) $(TARGET_GUI_CMX)
-PLUGIN_CMX_LIST += $(TARGET_TOP_CMXA)
-PLUGIN_GUI_CMX_LIST += $(TARGET_GUI_CMXA)
-DEP_CMXS=$(TARGET_TOP_CMXA)
-else
-PLUGIN_CMX_LIST += $(TARGET_TOP_CMX)
-PLUGIN_GUI_CMX_LIST += $(TARGET_GUI_CMX)
-DEP_CMXS=$(TARGET_TOP_CMX)
-endif
-endif
-
PLUGIN_INTERNAL_CMO_LIST += $(PLUGIN_CMO)
PLUGIN_INTERNAL_CMX_LIST += $(PLUGIN_CMX)
PLUGIN_DOC_LIST += @PLUGIN_NAME@_DOC
@@ -1045,7 +1006,6 @@ PLUGIN_OFLAGS:=
PLUGIN_DEPFLAGS:=
PLUGIN_DOCFLAGS:=
PLUGIN_GENERATED:=
-PLUGIN_DYNAMIC:=
PLUGIN_TYPES_CMO:=
PLUGIN_GUI_CMO:=
PLUGIN_GUI_CMX:=
diff --git a/share/configure.ac b/share/configure.ac
index 1c7649e3873..a668fbce4f6 100644
--- a/share/configure.ac
+++ b/share/configure.ac
@@ -87,8 +87,7 @@ define([PLUGIN_NAME],$1)
define([PLUGIN_FILE],$2)
define([PLUGIN_MSG],$3)
define([PLUGIN_DEFAULT],$4)
-define([PLUGIN_DYNAMIC],$5)
-define([PLUGIN_ADDITIONAL_DIR],$6)
+define([PLUGIN_ADDITIONAL_DIR],$5)
AC_CHECK_FILE(PLUGIN_FILE,
default=PLUGIN_DEFAULT;plugin_present=yes,
plugin_present=no;default=no)
@@ -123,13 +122,9 @@ if test "$default" = "no" -a "$FORCE" = "no"; then
[INFO_]UP=" (not available by default)"
fi
-# Dynamic plug-ins configuration
-m4_if("PLUGIN_DYNAMIC","yes",
- USE_NATIVE_DYNLINK="${USE_NATIVE_DYNLINK} PLUGIN_NAME"
- [DYNAMIC_]UP=yes)
+USE_NATIVE_DYNLINK="${USE_NATIVE_DYNLINK} PLUGIN_NAME"
AC_SUBST([ENABLE_]UP)
-AC_SUBST([DYNAMIC_]UP)
echo "PLUGIN_NAME... $ENABLE"
# kept defined for write_plugin_config. A bit ugly, but not more than
# usual autoconf stuff.
@@ -137,7 +132,6 @@ echo "PLUGIN_NAME... $ENABLE"
m4_undefine([PLUGIN_FILE])
m4_undefine([PLUGIN_MSG])
m4_undefine([PLUGIN_DEFAULT])
-m4_undefine([PLUGIN_DYNAMIC])
m4_undefine([PLUGIN_ADDITIONAL_DIR])
m4_undefine([UP])
]) # end of check_plugin
diff --git a/src/plugins/aorai/Makefile.in b/src/plugins/aorai/Makefile.in
index f90f38c1504..4dece6dd180 100644
--- a/src/plugins/aorai/Makefile.in
+++ b/src/plugins/aorai/Makefile.in
@@ -39,7 +39,6 @@ endif
PLUGIN_DIR ?=.
PLUGIN_ENABLE:=@ENABLE_AORAI@
-PLUGIN_DYNAMIC:=@DYNAMIC_AORAI@
PLUGIN_NAME:=Aorai
PLUGIN_GENERATED:= $(addprefix ${PLUGIN_DIR}/, \
promelalexer_withexps.ml promelaparser_withexps.ml \
diff --git a/src/plugins/loop_analysis/Makefile.in b/src/plugins/loop_analysis/Makefile.in
index cd033638e2c..27f7553a93f 100644
--- a/src/plugins/loop_analysis/Makefile.in
+++ b/src/plugins/loop_analysis/Makefile.in
@@ -28,7 +28,6 @@ FRAMAC_LIBDIR :=$(shell frama-c-config -print-libpath)
endif
PLUGIN_ENABLE:=@ENABLE_LOOP_ANALYSIS@
-PLUGIN_DYNAMIC:=@DYNAMIC_LOOP_ANALYSIS@
PLUGIN_DISTRIBUTED:=$(PLUGIN_ENABLE)
PLUGIN_NAME:= LoopAnalysis
diff --git a/src/plugins/nonterm/Makefile.in b/src/plugins/nonterm/Makefile.in
index f92c47d2f7b..c59d89cee5d 100644
--- a/src/plugins/nonterm/Makefile.in
+++ b/src/plugins/nonterm/Makefile.in
@@ -35,7 +35,6 @@ endif
PLUGIN_DIR ?=.
PLUGIN_ENABLE:=@ENABLE_NONTERM@
-PLUGIN_DYNAMIC:=@DYNAMIC_NONTERM@
PLUGIN_NAME:=Nonterm
PLUGIN_CMO:= nonterm_run
PLUGIN_DISTRIBUTED:=$(PLUGIN_ENABLE)
diff --git a/src/plugins/obfuscator/Makefile.in b/src/plugins/obfuscator/Makefile.in
index 349ced06831..ad3967eddf0 100644
--- a/src/plugins/obfuscator/Makefile.in
+++ b/src/plugins/obfuscator/Makefile.in
@@ -29,7 +29,6 @@ endif
PLUGIN_DIR ?=.
PLUGIN_ENABLE:=@ENABLE_OBFUSCATOR@
-PLUGIN_DYNAMIC:=@DYNAMIC_OBFUSCATOR@
PLUGIN_NAME:=Obfuscator
PLUGIN_CMO:= options \
diff --git a/src/plugins/report/Makefile.in b/src/plugins/report/Makefile.in
index 3ba3f77b06a..a223bdd7432 100644
--- a/src/plugins/report/Makefile.in
+++ b/src/plugins/report/Makefile.in
@@ -35,7 +35,6 @@ endif
PLUGIN_DIR ?=.
PLUGIN_ENABLE:=@ENABLE_REPORT@
-PLUGIN_DYNAMIC:=@DYNAMIC_REPORT@
PLUGIN_NAME:=Report
PLUGIN_CMO:= report_parameters scan dump csv register
PLUGIN_DISTRIBUTED:=$(PLUGIN_ENABLE)
diff --git a/src/plugins/security_slicing/Makefile.in b/src/plugins/security_slicing/Makefile.in
index ddfc1ee05a5..5a5ae0fba43 100644
--- a/src/plugins/security_slicing/Makefile.in
+++ b/src/plugins/security_slicing/Makefile.in
@@ -31,7 +31,6 @@ endif
PLUGIN_DIR ?=.
PLUGIN_ENABLE:=@ENABLE_SECURITY_SLICING@
-PLUGIN_DYNAMIC:=@DYNAMIC_SECURITY_SLICING@
PLUGIN_NAME:=Security_slicing
PLUGIN_CMO:= security_slicing_parameters components
PLUGIN_GUI_CMO:= register_gui
diff --git a/src/plugins/variadic/Makefile.in b/src/plugins/variadic/Makefile.in
index 7f2b7f2c5ce..17d262c6e76 100644
--- a/src/plugins/variadic/Makefile.in
+++ b/src/plugins/variadic/Makefile.in
@@ -35,7 +35,6 @@ endif
PLUGIN_DIR ?= .
PLUGIN_ENABLE := @ENABLE_VARIADIC@
-PLUGIN_DYNAMIC := @DYNAMIC_VARIADIC@
PLUGIN_NAME := Variadic
PLUGIN_CMI := format_types va_types
PLUGIN_CMO := options extends va_build environment \
diff --git a/src/plugins/wp/Makefile.in b/src/plugins/wp/Makefile.in
index 3f02cd025d0..e35df03c47c 100644
--- a/src/plugins/wp/Makefile.in
+++ b/src/plugins/wp/Makefile.in
@@ -54,7 +54,6 @@ PLUGIN_GUI_CMO:= \
endif
PLUGIN_ENABLE:=@ENABLE_WP@
-PLUGIN_DYNAMIC:=@DYNAMIC_WP@
PLUGIN_NAME:=Wp
PLUGIN_CMO:= \
rformat wprop \
--
GitLab