~ubuntu-branches/ubuntu/trusty/liquidsoap/trusty

« back to all changes in this revision

Viewing changes to Makefile.rules

  • Committer: Bazaar Package Importer
  • Author(s): Romain Beauxis
  • Date: 2011-10-18 16:43:01 UTC
  • Revision ID: james.westby@ubuntu.com-20111018164301-491ju2x39ymu0ct9
Tags: 1.0.0-3
Better patch to compute lo dymanic plugin dependencies.

Show diffs side-by-side

added added

removed removed

Lines of Context:
141
141
# Compute plugins dependencies that are not already
142
142
# linked with liquidsoap
143
143
plug_packages = \
144
 
  $(if $(findstring " $(2)",$($(PROG)_ocamllflags) $($(PROG)_ocamlcflags)),$(eval $(1)_dontlink += $(2)),$(eval $(1)_ocamllflags += -package $(2)))
 
144
  $(if $(findstring $(2),$($(PROG)_ocamllflags) $($(PROG)_ocamlcflags)),$(eval $(1)_dontlink += $(2)),$(eval $(1)_ocamllflags += -package $(2)))
145
145
$(foreach plug,$($(PROG)_PLUGINS),\
146
146
    $(foreach package,$($(plug)_packages),$(call plug_packages,$(plug),$(package))))
147
147
 
156
156
flac_ogg_dontlink += ogg flac
157
157
lastfm_dontlink += xmlm xmlplaylist
158
158
 
 
159
# Lo name is too generic for the above test to pass
 
160
lo_dontlink =
 
161
lo_ocamllflags += -package lo
 
162
 
159
163
# Here is how compilation of .ml files work:
160
164
# We concatenate all {C,L}FLAGS for .ml compilation.
161
165
# However, when linking the final objects, we seperate them back.