X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=8b0d51aab32d045a283cd1fad4066dc5e963bf2d;hp=92f82aefa3c0de64e49fd11a109963dfb32be5c7;hb=54639f8de60d5ea53bf49383294d403f526e25ca;hpb=e183111b2101350b6e0b0b0cfb0fabd88dbad30c

diff --git a/Makefile b/Makefile
index 92f82ae..8b0d51a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,13 +7,20 @@ moz_include_dir := \
 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
 # 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
+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
@@ -24,15 +31,18 @@ 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 svn-commit*.tmp *.dvdauthor *.png *.vob *.spumux
+	rm -rf .objs
+	rm -f webdvd *~ .\#* *.orig *.rej svn-commit*.tmp
 
 distclean : clean
 	rm -rf .svn
@@ -44,37 +54,46 @@ 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='"$(webdvd_lib_dir)"'
+.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 $@ $<
 
-ifneq ($(MAKECMDGOALS),clean)
-    include $(cxxsources:.cpp=.d) $(csources:.c=.d)
-endif
+.objs/%.o : %.cpp .objs/.created
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
 
-# Temporary rule for testing output files.
+.objs/%.o : %.c .objs/.created
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
 
-%.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 > $@
+%/.created :
+	mkdir -p $*
+	touch $@
+
+ifneq ($(MAKECMDGOALS),clean)
+    include $(cxxsources:%.cpp=.objs/%.d) $(csources:%.c=.objs/%.d)
+endif