prevent popup deactivation while button_down

[goodguy/history.git] / cinelerra-5.0 / build / Makefile.cinelerra

diff --git a/cinelerra-5.0/build/Makefile.cinelerra b/cinelerra-5.0/build/Makefile.cinelerra
index f2db54be99bcc8ff67cae8a65d62d4763c6c2b3e..6537a5ea32b71c328601fc79ca7896c8ed2465d4 100644 (file)
--- a/cinelerra-5.0/build/Makefile.cinelerra
+++ b/cinelerra-5.0/build/Makefile.cinelerra
@@ -10,7 +10,6 @@ endif
 
 DIRS := \
        thirdparty \
-       quicktime \
        libzmpeg3 \
        mpeg2enc \
        mplexlo \
@@ -47,15 +46,21 @@ dist-clean:
 #      find \( -name .deps \) -exec rm -rf {} \; -prune
        find \( -name .libs \) -exec rm -rf {} \; -prune
 
-MJPEGDIR := $(shell expr thirdparty/mjpegtools* )
+MJPEGDIR := $(shell expr $(THIRDPARTY)/mjpegtools* )
+MPEG2ENC := bin/mpeg2enc
+MPEG2PLEX := bin/mplex
+HVEG2ENC := bin/hveg2enc
 
-$(PLUGIN_DIR)/mpeg2enc.plugin:
-       /bin/cp -a $(MJPEGDIR)/mpeg2enc/mpeg2enc $@
+$(MPEG2ENC):
+       cp -a $(MJPEGDIR)/mpeg2enc/mpeg2enc $@
 
-bin/mplex:
-       /bin/cp -a $(MJPEGDIR)/mplex/mplex $@
+$(MPEG2PLEX):
+       cp -a $(MJPEGDIR)/mplex/mplex $@
 
-install:       $(PLUGIN_DIR)/mpeg2enc.plugin bin/mplex
+$(HVEG2ENC):
+       cp -a $(TOPDIR)/mpeg2enc/$(OBJDIR)/hveg2enc $@
+
+install:       $(MPEG2PLEX) $(MPEG2ENC) $(HVEG2ENC)
        $(MAKE) -C plugins install
        DST=../bin $(MAKE) -C libzmpeg3 install
        $(MAKE) -C po install
@@ -69,13 +74,13 @@ ifeq ($(STATIC_LIBRARIES), y)
 endif
        cp -a models bin
        cd bin && find -name '.svn' -exec rm -r {} \; -prune
-       rm -f bin/cutads
-       cp -a cinelerra/$(OBJDIR)/cutads bin/.
+       rm -f bin/cutads bin/bdwrite bin/manual.pdf
+       cp -a cinelerra/$(OBJDIR)/cutads cinelerra/$(OBJDIR)/bdwrite bin/.
        cp -a doc/manual.pdf bin/.
        rm -f bin/new_db
        $(MAKE) -C db/utils new_db
        cp -a db/utils/new_db bin/.
-       cp -a ffmpeg bin/.
+       cp -a ffmpeg msg.txt bin/.
        @if [ ! -f "/cinelerra/media.db" ]; then \
                echo "need to run:"; \
                echo "  mkdir /cinelerra"; \