diff options
| author |  Enrico Tassi <gareuselesinge@debian.org> | 2015-07-15 13:15:50 +0200 |
|---|---|---|
| committer | Enrico Tassi <gareuselesinge@debian.org> | 2015-07-15 13:15:50 +0200 |
| commit | e347929583f820a2cc0296597b6382309e930989 (patch) | |
| tree | cdc3f18fc5c66a9d3d7cc8404c6a295169e41fcc /Makefile.common | |
| parent | c01be74d81a5466c58f8dc6c568db286b0979997 (diff) | |
| parent | 0aa2544d04dbd4b6ee665b551ed165e4fb02d2fa (diff) | |
Merge tag 'upstream/8.5_beta2+dfsg' into test
Upstream version 8.5~beta2+dfsg
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common index d752a5be..07df8bb1 100644 --- a/Makefile.common +++ b/Makefile.common @@ -207,12 +207,21 @@ ifneq ($(HASNATDYNLINK),false) PLUGINS:=$(PLUGINSCMA) PLUGINSOPT:=$(PLUGINSCMA:.cma=.cmxs) else +ifeq ($(BEST),byte) + STATICPLUGINS:= + INITPLUGINS:=$(EXTRACTIONCMA) $(FOCMA) $(CCCMA) \ + $(FUNINDCMA) $(NATSYNTAXCMA) + INITPLUGINSOPT:=$(INITPLUGINS:.cma=.cmxs) + PLUGINS:=$(PLUGINSCMA) + PLUGINSOPT:=$(PLUGINSCMA:.cma=.cmxs) +else STATICPLUGINS:=$(PLUGINSCMA) INITPLUGINS:= INITPLUGINSOPT:= PLUGINS:= PLUGINSOPT:= endif +endif LINKCMO:=$(CORECMA) $(STATICPLUGINS) LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa) @@ -279,6 +288,7 @@ STRINGSVO:=$(call cat_vo_itarget, theories/Strings) SETSVO:=$(call cat_vo_itarget, theories/Sets) FSETSVO:=$(call cat_vo_itarget, theories/FSets) MSETSVO:=$(call cat_vo_itarget, theories/MSets) +MMAPSVO:=$(call cat_vo_itarget, theories/MMaps) RELATIONSVO:=$(call cat_vo_itarget, theories/Relations) WELLFOUNDEDVO:=$(call cat_vo_itarget, theories/Wellfounded) REALSVO:=$(call cat_vo_itarget, theories/Reals) @@ -294,7 +304,7 @@ THEORIESVO:=\ $(RELATIONSVO) $(WELLFOUNDEDVO) $(SETOIDSVO) \ $(LISTSVO) $(STRINGSVO) \ $(PARITHVO) $(NARITHVO) $(ZARITHVO) \ - $(SETSVO) $(FSETSVO) $(MSETSVO) \ + $(SETSVO) $(FSETSVO) $(MSETSVO) $(MMAPSVO) \ $(REALSVO) $(SORTINGVO) $(QARITHVO) \ $(NUMBERSVO) $(STRUCTURESVO) $(VECTORSVO) |