X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2FMakefile.am;h=9b78846c3ec2ca32d7ccfdd8a801d25e7044cb6d;hb=559af27994c49da1d98e085f4ac2ec1ad1d1d27c;hp=a3d3aa64f8389a19d71ccc9c5acc27fd04041fee;hpb=6bcc7c5880782aadfdab7dd4b0c546eca8808641;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am
index a3d3aa64..9b78846c 100644
--- a/cinelerra-5.1/Makefile.am
+++ b/cinelerra-5.1/Makefile.am
@@ -1,8 +1,8 @@
-PKG_CFLAGS_ := $(CFLAGS)
-PKG_CXXFLAGS_ := $(CXXFLAGS)
-PKG_LDFLAGS_ := $(LDFLAGS)
+CFLAGS_ := $(CFLAGS)
+CXXFLAGS_ := $(CXXFLAGS)
+LDFLAGS_ := $(LDFLAGS)
 
-export PKG_CFLAGS_ PKG_CXXFLAGS_ PKG_LDFLAGS_
+export CFLAGS_ CXXFLAGS_ LDFLAGS_
 unexport CFLAGS CXXFLAGS LDFLAGS
 
 AM_MAKEFLAGS := -j$(WANT_JOBS)
@@ -15,9 +15,10 @@ SUBDIRS = thirdparty libzmpeg3 mpeg2enc mplexlo \
 
 BUILT_SOURCES := bin
 bin:
-	mkdir -p bin bin/applications bin/pixmaps
+	mkdir -p bin bin/applications bin/pixmaps bin/lv2
 
 clean-generic:
+	rm -rf thirdparty/opencv*
 	rm -rf bin
 
 inst_sh := $(CURDIR)/inst.sh
@@ -31,12 +32,18 @@ export mkinstalldirs install_sh inst_sh
 
 # install to bin
 binstall:	install-recursive
-	cp -a COPYING README models ffmpeg msg.txt bin/.
+	cp -a COPYING README models Cinelerra_factory ffmpeg msg info tips bin/.
 	sed -e 's/\<cin\>/$(WANT_CIN)/g' < image/cin.desktop \
 		> "bin/applications/$(WANT_CIN).desktop"
 	cp -a image/cin.svg "bin/pixmaps/$(WANT_CIN)".svg
 	cp -a image/cin.xpm "bin/pixmaps/$(WANT_CIN)".xpm
-	cp -a db/utils/new_db "bin/cin_db"
+	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
+	-cp -a db/utils/new_db "bin/cin_db"
+	cp -av lv2_blacklist.txt bin/.
 
 buninstall:
 	rm -rf bin
@@ -44,11 +51,14 @@ buninstall:
 # with system_build
 cinstall:
 	cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" "$(WANT_CIN)" \
-		cin_db mpeg3{cat,cc2txt,ifochk,show,toc}
+		cin_db zmpeg3{cat,cc2txt,ifochk,show,toc}
 	cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
-		bdwrite cutads hveg2enc mpeg2enc mplex mplexlo
+		bdwrite cutads lv2ui
+	-cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
+		hveg2enc mpeg2enc mplex mplexlo
 	cd bin; $(inst_sh) "$(DESTDIR)$(datadir)/$(WANT_CIN)" \
-		COPYING README msg.txt ffmpeg doc models
+		COPYING README models Cinelerra_factory ffmpeg msg info tips doc \
+		lv2 lv2_blacklist.txt
 	cd bin/locale; $(inst_sh) "$(DESTDIR)$(localedir)" .
 	cd bin/plugins; $(inst_sh) "$(DESTDIR)$(WANT_PLUGIN_DIR)" .
 	cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" .
@@ -57,7 +67,7 @@ cinstall:
 
 cuninstall:
 	rm -f "$(DESTDIR)$(bindir)/$(WANT_CIN)"
-	rm -f "$(DESTDIR)$(bindir)"/mpeg3{cat,cc2txt,ifochk,show,toc}
+	rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cat,cc2txt,ifochk,show,toc}
 	rm -f "$(DESTDIR)$(bindir)/cin_db"
 	rm -rf "$(DESTDIR)$(WANT_CINLIB_DIR)"
 	rm -rf "$(DESTDIR)$(datadir)/$(WANT_CIN)"