X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2FMakefile.devel;h=a12d8f2b0d67fe51e8e3984677f8c6574ad61b97;hp=ae6c41e00dae84a97b83973c2244d3dc8ede12c5;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hpb=78555663c7d2d1148808014cc7ada53255c0c305

diff --git a/cinelerra-5.1/Makefile.devel b/cinelerra-5.1/Makefile.devel
index ae6c41e0..a12d8f2b 100644
--- a/cinelerra-5.1/Makefile.devel
+++ b/cinelerra-5.1/Makefile.devel
@@ -8,22 +8,27 @@ cpus:=$(shell grep -c "^proc" /proc/cpuinfo)
 jobs:=-j$(shell echo $$(($(cpus) + $(cpus)/2 +2)))
 MAKEJ := $(MAKE) $(jobs)
 
-SUBDIRS := thirdparty libzmpeg3 mpeg2enc mplexlo\
- db guicast cinelerra plugins doc po
+SUBDIRS = thirdparty libzmpeg3 mpeg2enc mplexlo \
+	db guicast cinelerra plugins doc po
 
 all:
-	mkdir -p bin
+	mkdir -p bin bin/lv2
 	+for dir in $(SUBDIRS); do $(MAKEJ) -C $$dir all; done
 
 clean:
 	for dir in $(SUBDIRS); do $(MAKE) -C $$dir clean; done
+	rm -rf thirdparty/opencv*
 	rm -rf bin
 	./autogen.sh clean
 
 install:
 	for dir in $(SUBDIRS); do $(MAKE) -C $$dir install; done
-	cp -a COPYING README models ffmpeg msg info tips bin/.
-	for d in picon*; do cp -a $$d/. bin/plugins/$$d/.; done
+	cp -a COPYING README models Cinelerra_factory ffmpeg msg info tips bin/.
+	cp -a lv2_blacklist.txt bin/.
+	mkdir -p bin/plugins/picon/cinfinity; for d in picon/*; do \
+	  if [ $$d = picon/cinfinity ]; then continue; fi; \
+	  cp -a $$d bin/plugins/picon/.; \
+	done
 
 rebuild:
 	$(MAKE) -C guicast clean
@@ -38,9 +43,9 @@ rebuild_all:
 	$(MAKE) -C libzmpeg3 clean
 	+$(MAKEJ) -C libzmpeg3
 	$(MAKE) -C db clean
-	+$(MAKEJ) -C db
+	+$(MAKEJ) -C db all
 	$(MAKE) rebuild
-	+$(MAKEJ) -C db/utils
+	+$(MAKEJ) -C db utils
 
 rebuild_install:
 	$(MAKE) -C cinelerra install