X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=02a8030579a95f16fc063525b4ffb587a983bf28;hp=069a59fa8a2114f26dd4f12b55bc8220058d4af3;hb=84fb85103e80499cc8dc7929375e9a1798e043da;hpb=5746a18015788678b85907421f91adf249ea71d3

diff --git a/Makefile b/Makefile
index 069a59f..02a8030 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,16 @@ sharedir := $(prefix)/share
 docdir := $(sharedir)/doc
 mandir := $(sharedir)/man
 
-moz_include_dir := \
-    $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
-moz_lib_dir := \
-    $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/lib/mozilla
+# Prefer XULRunner to the old Mozilla
+ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
+    mozilla := xulrunner
+else
+    mozilla := mozilla
+endif
+
+moz_prefix := $(shell pkg-config --variable=prefix $(mozilla)-gtkmozembed)
+moz_include_dir := $(moz_prefix)/include/$(mozilla)
+moz_lib_dir := $(moz_prefix)/lib/$(mozilla)
 
 moz_version := \
     $(shell sed 's/\#define MOZILLA_VERSION "\(.*\)"/\1/; t; d' \
@@ -20,7 +26,8 @@ moz_version_patchlevel := $(word 3,$(subst ., ,$(moz_version)))
 CFLAGS := -ansi -Wall -Wunused -Wno-unused-parameter
 CPPFLAGS := -D_REENTRANT
 CXXFLAGS := -ansi -Wall -Wunused
-LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
+LDFLAGS := -lpthread                                                   \
+           $(shell pkg-config --libs gtkmm-2.0 $(mozilla)-gtkmozembed) \
            -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
 
 ifdef NDEBUG
@@ -34,8 +41,8 @@ endif
 cxxsources := \
     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 videolink.cpp x_frame_buffer.cpp  \
-    xml_utils.cpp xpcom_support.cpp
+    temp_file.cpp video.cpp vob_list.cpp videolink.cpp warp_pointer.cpp    \
+    x_frame_buffer.cpp xml_utils.cpp xpcom_support.cpp
 csources := jquant2.c
 
 videolink : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o)
@@ -56,26 +63,23 @@ install :
 	gzip -c9 videolink.1 >$(DESTDIR)$(mandir)/man1/videolink.1.gz
 	chmod 644 $(DESTDIR)$(mandir)/man1/videolink.1.gz
 	mkdir -p -m 755 $(DESTDIR)$(sharedir)/videolink
-	install -m 644 videolink.css $(DESTDIR)$(sharedir)/videolink
+	install -m 644 *.css $(DESTDIR)$(sharedir)/videolink
 
 .PHONY : clean install
 
 .objs/browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
 .objs/videolink.% \
-    : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"'    \
-                  -DMOZ_VERSION_MAJOR=$(moz_version_major)           \
-                  -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
-                  -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
+    : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"'
 
-.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \
-.objs/temp_file.% .objs/vob_list.% .objs/videolink.%        \
+.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.%               \
+.objs/temp_file.% .objs/vob_list.% .objs/videolink.% .objs/warp_pointer.% \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
-.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \
-.objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.%  \
-.objs/xpcom_support.%                                               \
-    : CPPFLAGS += $(shell pkg-config --cflags mozilla-gtkmozembed)
+.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.%   \
+.objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.%    \
+.objs/xpcom_support.%                                                 \
+    : CPPFLAGS += $(shell pkg-config --cflags $(mozilla)-gtkmozembed)
 # Non-virtual destructors are fine in XPCOM interface classes since
 # instances are only ever called by the Release function which is virtual.
 .objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \
@@ -84,23 +88,24 @@ install :
     : CXXFLAGS += -Wno-non-virtual-dtor
 
 # These dig a bit deeper into Mozilla
-.objs/link_iterator.% .objs/style_sheets.% .objs/videolink.%               \
-    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                       \
-                    content docshell dom gfx layout necko webshell widget)
-
-.objs/null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv
-
-.objs/%.d : %.cpp .objs/.created
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM -MF $@ $<
+.objs/link_iterator.% .objs/null_prompt_service.% .objs/style_sheets.% \
+.objs/videolink.%                                                      \
+    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                   \
+                    content docshell dom gfx layout locale necko uconv \
+                    webshell widget)                                   \
+		  -DMOZILLA_INTERNAL_API                               \
+                  -DMOZ_VERSION_MAJOR=$(moz_version_major)             \
+                  -DMOZ_VERSION_MINOR=$(moz_version_minor)             \
+                  -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
 
-.objs/%.d : %.c .objs/.created
-	$(CC) $(CFLAGS) $(CPPFLAGS) -MM -MF $@ $<
+.objs/%.d : .objs/.created
+	touch $@
 
 .objs/%.o : %.cpp .objs/.created
-	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -MD -MF .objs/$*.d -c $<
 
 .objs/%.o : %.c .objs/.created
-	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -MD -MF .objs/$*.d -c $<
 
 %/.created :
 	mkdir -p $*