X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=13830561967fad9ecaf609c77c1457cbe5809835;hp=168ca2c26781441404d26abe0cf6bfa25514342c;hb=c13714f6498df33e02635421354f5fb88a60eb3d;hpb=8ad736f3542b97f752c0a19c1b9f1e8fc927a904

diff --git a/Makefile b/Makefile
index 168ca2c..1383056 100644
--- 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
 
+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 := -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)
+           -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
 
 ifdef NDEBUG
     CPPFLAGS += -DNDEBUG
@@ -20,15 +31,16 @@ 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 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)
 	$(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
@@ -40,21 +52,24 @@ install :
 
 .PHONY : clean distclean install
 
-browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
+browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
 webdvd.% \
-    : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(prefix)/lib/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.% \
+browser_widget.% generate_dvd.% pixbufs.% temp_file.% vob_list.% webdvd.% \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
-browserwidget.% childiterator.o linkiterator.% stylesheets.% webdvd.% \
-xpcom_support.%                                                       \
+browser_widget.% child_iterator.o link_iterator.% style_sheets.% webdvd.% \
+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)/,                         \
+link_iterator.% style_sheets.% webdvd.%                                    \
+    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                       \
                     content docshell dom gfx layout necko webshell widget)
 
 %.d : %.cpp
@@ -66,12 +81,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 > $@