X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=989ef7d50271bcb58869ad5a49b2b9b2ba2d34ee;hb=1b6026c7baa122b99011f760857b80b7f253dfbb;hp=92f82aefa3c0de64e49fd11a109963dfb32be5c7;hpb=e183111b2101350b6e0b0b0cfb0fabd88dbad30c;p=videolink.git

diff --git a/Makefile b/Makefile
index 92f82ae..989ef7d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,13 @@ moz_include_dir := \
 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
 # Non-virtual destructors are fine in XPCOM interface classes since
@@ -25,14 +32,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
@@ -46,9 +54,13 @@ install :
 
 browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
-webdvd.% : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'
+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.% \
+browserwidget.% pixbufs.% temp_file.% webdvd.% \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
 browserwidget.% childiterator.o linkiterator.% stylesheets.% webdvd.% \
@@ -69,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 > $@