Changed WebDvdWindow to generate temporary files in the proper way, spawn external...

[videolink.git] / Makefile

diff --git a/Makefile b/Makefile
index 168ca2c26781441404d26abe0cf6bfa25514342c..be6565ec6b272d75ef8145f76d1ab320ab27087c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 prefix := /usr/local
 
+webdvd_lib_dir := $(prefix)/lib/webdvd
+
 moz_include_dir := \
     $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
 moz_lib_dir := \
@@ -7,7 +9,9 @@ moz_lib_dir := \
 
 CFLAGS := -Wall
 CPPFLAGS := -D_REENTRANT
-CXXFLAGS := -Wall
+# Non-virtual destructors are fine in XPCOM interface classes since
+# instances are only ever called by the Release function which is virtual.
+CXXFLAGS := -Wall -Wno-non-virtual-dtor
 LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
            -Wl,-rpath -Wl,$(moz_lib_dir)
 
@@ -21,14 +25,15 @@ endif
 
 cxxsources := \
     auto_proc.cpp browserwidget.cpp childiterator.cpp framebuffer.cpp \
-    linkiterator.cpp pixbufs.cpp stylesheets.cpp webdvd.cpp xpcom_support.cpp
+    linkiterator.cpp pixbufs.cpp stylesheets.cpp temp_file.cpp video.cpp \
+    webdvd.cpp xpcom_support.cpp
 csources := jquant2.c
 
 webdvd : $(cxxsources:.cpp=.o) $(csources:.c=.o)
        $(CXX) $(LDFLAGS) -o $@ $^
 
 clean :
-       rm -f webdvd *.d *.o *~ .\#* *.orig *.rej svn-commit*.tmp *.dvdauthor *.png *.vob *.spumux
+       rm -f webdvd *.d *.o *~ .\#* *.orig *.rej svn-commit*.tmp
 
 distclean : clean
        rm -rf .svn
@@ -42,10 +47,9 @@ install :
 
 browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
-webdvd.% \
-    : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(prefix)/lib/webdvd"'
+webdvd.% : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'
 
-browserwidget.% pixbufs.% webdvd.% \
+browserwidget.% pixbufs.% temp_file.% webdvd.% \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
 browserwidget.% childiterator.o linkiterator.% stylesheets.% webdvd.% \
@@ -66,12 +70,3 @@ linkiterator.% stylesheets.% webdvd.%                                        \
 ifneq ($(MAKECMDGOALS),clean)
     include $(cxxsources:.cpp=.d) $(csources:.c=.d)
 endif
-
-# Temporary rule for testing output files.
-
-%.vob : %_back.png %.spumux %_links.png
-       pngtopnm $*_back.png                                   \
-       | ppmtoy4m -v0 -n 1 -F 25:1 -A 59:54 -I p -S 420_mpeg2 \
-       | mpeg2enc -v0 -f 8 -a 2 -o /dev/stdout                \
-       | mplex -v0 -f 8 -o /dev/stdout /dev/stdin             \
-       | spumux -v0 -m dvd $*.spumux > $@