version update, Features5 update, proxy tweak

[goodguy/history.git] / cinelerra-5.1 / thirdparty / Makefile

diff --git a/cinelerra-5.1/thirdparty/Makefile b/cinelerra-5.1/thirdparty/Makefile
index 9bcbab0deb9799f17544325c13cb16d6e301737d..d1555b9d4fd32d318ceca034a27d453fc4b08d11 100644 (file)
--- a/cinelerra-5.1/thirdparty/Makefile
+++ b/cinelerra-5.1/thirdparty/Makefile
@@ -28,6 +28,8 @@ include $(TOPDIR)/global_config
 -include $(TOPDIR)/cin_config
 BLD := $(THIRDPARTY)/build
 
+ifneq ($(WANT_CIN_3RDPARTY),no)
+
 # package build flags, if needed
 # need frame pointer for debugs and helps with profiling
 # NOTE: the trailing blank is MANDITORY or the builds fail
@@ -219,7 +221,9 @@ LV2_PKGCFG:=$(subst : ,:,$(foreach p,lv2 serd sord sratom lilv suil,$(call pkg_c
 
 # lv2
 define waf-setup
-$(1).cfg_vars+=echo 'exec ./waf configure "$(DS)@"' > ./configure; chmod +x \
+$(1).cfg_vars+=./waf --version; find .waf* -type f -name "*.py" | \
+ while read f; do sed -e '/StopIter/d' -i "$(DS)f"; done; \
+ echo 'exec ./waf configure "$(DS)@"' > ./configure; chmod +x \
  ./configure;  PKG_CONFIG_PATH=$(LV2_PKGCFG) LD_LIBRARY_PATH=$(LV2_LIBPATH) 
 $(1).cfg_params+=\
  CFLAGS="-I$(call bld_path,lv2) $(foreach f,$(2), $(call inc_path,$(f))) -fPIC "\
@@ -245,7 +249,7 @@ suil.cfg_params?= --static --no-qt
 $(eval $(call waf-setup,lv2))
 $(eval $(call waf-setup,serd))
 $(eval $(call waf-setup,sord, serd))
-$(eval $(call waf-setup,sratom, serd sord))
+$(eval $(call waf-setup,sratom, serd sord lv2))
 $(eval $(call waf-setup,lilv, lv2 sratom serd sord))
 $(eval $(call waf-setup,suil, lv2))
 
@@ -310,7 +314,7 @@ $(call rules,$(call std-build,libvpx))
 $(call rules,$(call std-build,lv2))
 $(call rules,$(call std-build,serd))
 $(call rules,$(call std-build,sord, serd))
-$(call rules,$(call std-build,sratom, serd sord))
+$(call rules,$(call std-build,sratom, serd sord lv2))
 $(call rules,$(call std-build,lilv, lv2 sratom serd sord))
 $(call rules,$(call std-build,suil, lv2))
 
@@ -343,7 +347,13 @@ clean:
 install:
        cp -a $(ver_mjpegtools)/mpeg2enc/mpeg2enc $(BINDIR)/.
        cp -a $(ver_mjpegtools)/mplex/mplex $(BINDIR)/.
+else
+# not WANT_CIN_3RDPARTY
+all:
+clean:
+install:
 
+endif
 val-%:
        @echo $($(subst val-,,$@))