add resource wdw folder expanders, fix plugin close deadlock detect

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

diff --git a/cinelerra-5.1/Makefile.am b/cinelerra-5.1/Makefile.am
index 9b78846c3ec2ca32d7ccfdd8a801d25e7044cb6d..a61379cf3528f160d035ffe7c7ee21d139baf7b0 100644 (file)
--- a/cinelerra-5.1/Makefile.am
+++ b/cinelerra-5.1/Makefile.am
@@ -23,16 +23,17 @@ clean-generic:
 
 inst_sh := $(CURDIR)/inst.sh
 
-install:       binstall $(sinstall)
+install:       bin_install $(MAK_INSTALLS)
 
-uninstall:     buninstall $(suninstall)
+uninstall:     bin_uninstall $(MAK_UNINSTALLS)
 
 .PHONY:        binstall cinstall cuninstall dinstall
 export mkinstalldirs install_sh inst_sh
 
 # install to bin
-binstall:      install-recursive
-       cp -a COPYING README models Cinelerra_factory ffmpeg msg info tips bin/.
+bin_install:   install-recursive
+       cp -a COPYING README models Cinelerra_factory expanders.txt \
+               ffmpeg msg info tips lv2_blacklist.txt 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
@@ -43,47 +44,70 @@ binstall:   install-recursive
          cp -a $$d bin/plugins/picon/.; \
        done
        -cp -a db/utils/new_db "bin/cin_db"
-       cp -av lv2_blacklist.txt bin/.
 
-buninstall:
+bin_uninstall:
        rm -rf bin
 
 # with system_build
-cinstall:
-       cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" "$(WANT_CIN)" \
-               cin_db zmpeg3{cat,cc2txt,ifochk,show,toc}
-       cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
-               bdwrite cutads lv2ui
-       -cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
-               hveg2enc mpeg2enc mplex mplexlo
+sys_install: $(CIN_INSTALLS)
+       cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" "$(WANT_CIN)" bdwrite
        cd bin; $(inst_sh) "$(DESTDIR)$(datadir)/$(WANT_CIN)" \
-               COPYING README models Cinelerra_factory ffmpeg msg info tips doc \
-               lv2 lv2_blacklist.txt
+               COPYING README models Cinelerra_factory expanders.txt \
+               ffmpeg msg info tips doc
        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)" .
        cd bin/applications; $(inst_sh) "$(DESTDIR)$(datadir)/applications" .
        cd bin/pixmaps; $(inst_sh) "$(DESTDIR)$(datadir)/pixmaps" .
 
-cuninstall:
+sys_uninstall: $(CIN_UNINSTALLS)
        rm -f "$(DESTDIR)$(bindir)/$(WANT_CIN)"
-       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)"
        rm -rf "$(DESTDIR)$(localedir)"/*/"LC_MESSAGES/$(WANT_CIN).mo"
        rm -rf "$(DESTDIR)$(WANT_PLUGIN_DIR)"
-       rm -rf "$(DESTDIR)$(WANT_LADSPA_DIR)"
        rm -f "$(DESTDIR)$(datadir)/applications/$(WANT_CIN).desktop"
        rm -f "$(DESTDIR)$(datadir)/pixmaps/$(WANT_CIN)".{svg,xpm}
 
 # without system_build
-dinstall:
+dvl_install:
        cp Makefile.devel Makefile
 
-duninstall:
+dvl_uninstall:
        rm -f Makefile
 
+# with-libzmpeg3
+zmp_install:
+       cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" \
+               zmpeg3{cat,cc2txt,ifochk,show,toc}
+       cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" \
+               hveg2enc mpeg2enc mplex mplexlo
+
+zmp_uninstall:
+       rm -f "$(DESTDIR)$(bindir)"/zmpeg3{cat,cc2txt,ifochk,show,toc}
+
+# with-commercial
+com_install:
+       cd bin; $(inst_sh) "$(DESTDIR)$(bindir)" cin_db
+       cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" cutads
+
+com_uninstall:
+       rm -f "$(DESTDIR)$(bindir)/cin_db"
+
+# with-ladspa
+lad_install:
+       cd bin/ladspa; $(inst_sh) "$(DESTDIR)$(WANT_LADSPA_DIR)" .
+
+lad_uninstall:
+       rm -rf "$(DESTDIR)$(WANT_LADSPA_DIR)"
+
+# with-lv2
+lv2_install:
+       cd bin; $(inst_sh) "$(DESTDIR)$(WANT_CINLIB_DIR)" lv2ui
+       cd bin; $(inst_sh) "$(DESTDIR)$(datadir)/$(WANT_CIN)" \
+               lv2 lv2_blacklist.txt
+
+lv2_uninstall:
+
 val-%:
        @echo $($(subst val-,,$@))