Use ffmpeg by default since it seems to work if we use pause correctly.

[videolink.git] / Makefile

diff --git a/Makefile b/Makefile
index 6a5ddc88a200a44307e867d8d912495a0bd22376..bc262931adc265853e58bca4479e30bcaa8ab33d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,26 @@
 prefix := /usr/local
 
+webdvd_lib_dir := $(prefix)/lib/webdvd
+
 moz_include_dir := \
     $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
 moz_lib_dir := \
     $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/lib/mozilla
 
-CFLAGS := -Wall
+moz_version := \
+    $(shell sed 's/\#define MOZILLA_VERSION "\(.*\)"/\1/; t; d' \
+            < $(moz_include_dir)/mozilla-config.h)
+moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
+moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))
+moz_version_patchlevel := $(word 3,$(subst ., ,$(moz_version)))
+
+CFLAGS := -ansi -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 := -ansi -Wall -Wno-non-virtual-dtor
 LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
-           -Wl,-rpath -Wl,$(moz_lib_dir)
+           -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
 
 ifdef NDEBUG
     CPPFLAGS += -DNDEBUG
@@ -20,55 +31,71 @@ else
 endif
 
 cxxsources := \
-    auto_proc.cpp browserwidget.cpp childiterator.cpp framebuffer.cpp \
-    linkiterator.cpp pixbufs.cpp stylesheets.cpp webdvd.cpp xpcom_support.cpp
+    auto_proc.cpp browser_widget.cpp child_iterator.cpp generate_dvd.cpp   \
+    link_iterator.cpp null_prompt_service.cpp pixbufs.cpp style_sheets.cpp \
+    temp_file.cpp video.cpp vob_list.cpp webdvd.cpp x_frame_buffer.cpp     \
+    xml_utils.cpp xpcom_support.cpp
 csources := jquant2.c
 
-webdvd : $(cxxsources:.cpp=.o) $(csources:.c=.o)
+webdvd : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o)
        $(CXX) $(LDFLAGS) -o $@ $^
 
 clean :
-       rm -f webdvd *.d *.o *~ \#* *.orig *.rej
+       rm -rf .objs
+       rm -f webdvd *~ .\#* *.orig *.rej svn-commit*.tmp
+
+distclean : clean
+       rm -rf .svn
 
 install :
        mkdir -p -m 755 $(prefix)/bin $(prefix)/lib/webdvd
        install -m 755 -s webdvd $(prefix)/bin
        install -m 644 webdvd.css $(prefix)/lib/webdvd
 
-.PHONY : clean install
+.PHONY : clean distclean install
 
-browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
+.objs/browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
-webdvd.% \
-    : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(prefix)/lib/webdvd"'
+.objs/webdvd.% \
+    : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'             \
+                  -DMOZ_VERSION_MAJOR=$(moz_version_major)           \
+                  -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
+                  -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
 
-browserwidget.% pixbufs.% webdvd.% \
+.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \
+.objs/temp_file.% .objs/vob_list.% .objs/webdvd.%           \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
-browserwidget.% childiterator.o linkiterator.% stylesheets.% webdvd.% \
-xpcom_support.%                                                       \
+.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \
+.objs/null_prompt_service.% .objs/style_sheets.% .objs/webdvd.%            \
+.objs/xpcom_support.%                                               \
     : CPPFLAGS += $(shell pkg-config --cflags mozilla-gtkmozembed)
 
 # These dig a bit deeper into Mozilla
-linkiterator.% stylesheets.% webdvd.%                                        \
-    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                         \
+.objs/link_iterator.% .objs/style_sheets.% .objs/webdvd.%                  \
+    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                       \
                     content docshell dom gfx layout necko webshell widget)
 
-%.d : %.cpp
+.objs/null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv
+
+.objs/%.d : %.cpp .objs/.created
        $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM -MF $@ $<
 
-%.d : %.c
+.objs/%.d : %.c .objs/.created
        $(CC) $(CFLAGS) $(CPPFLAGS) -MM -MF $@ $<
 
+.objs/%.o : %.cpp .objs/.created
+       $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+.objs/%.o : %.c .objs/.created
+       $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+%/.created :
+       mkdir -p $*
+       touch $@
+
 ifneq ($(MAKECMDGOALS),clean)
-    include $(cxxsources:.cpp=.d) $(csources:.c=.d)
+    include $(cxxsources:%.cpp=.objs/%.d) $(csources:%.c=.objs/%.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 > $@
+.PRECIOUS : %/.created