X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=380c7a04a59424e293c7394aac6fa4f8bb7a0869;hp=96be00e5c58b256b9a42db9845f07e11588cbf5e;hb=HEAD;hpb=2a5da5d55db1559b908978b08f381ec92c60a8f8

diff --git a/Makefile b/Makefile
index 96be00e..380c7a0 100644
--- a/Makefile
+++ b/Makefile
@@ -5,13 +5,28 @@ sharedir := $(prefix)/share
 docdir := $(sharedir)/doc
 mandir := $(sharedir)/man
 
-# Prefer XULRunner to the old Mozilla
-ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
+ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding && echo yes),yes)
+    moz_name := xulrunner-1.9
+    moz_pc := mozilla-gtkmozembed-embedding
+    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
+    moz_unstable_cppflags_extra :=
+    moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr)
+    # libxpcomglue needs libdl, but mozilla-gtkmozembed-embedding.pc
+    # doesn't mention it.
+    moz_ldflags_extra += -ldl
+else
+    ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
     moz_name := xulrunner
     moz_pc := xulrunner-gtkmozembed
-else
+    else
     moz_name := mozilla
     moz_pc := mozilla-gtkmozembed
+    endif
+    moz_unstable_cppflags_extra = \
+	$(addprefix -I$(moz_include_dir)/, \
+          content docshell dom gfx imglib2 layout locale necko uconv webshell widget) \
+	-DMOZILLA_INTERNAL_API
+    moz_ldflags_extra = -Wl,-rpath,$(moz_lib_dir)
 endif
 
 moz_prefix := $(shell pkg-config --variable=prefix $(moz_pc))
@@ -19,15 +34,18 @@ moz_include_dir := $(shell pkg-config --variable=includedir $(moz_pc))
 moz_lib_dir := $(moz_prefix)/lib/$(moz_name)
 
 moz_version := $(shell pkg-config --modversion $(moz_pc))
+# HACK: Replace 'b' for beta with micro=-1
+moz_version := $(subst b,.-1.,$(moz_version))
 moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
 moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))
+moz_version_micro := $(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.4 $(moz_pc))	\
-           -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
+           $(moz_ldflags_extra) -lexpat -lX11
 
 ifdef NDEBUG
     CPPFLAGS += -DNDEBUG
@@ -38,9 +56,10 @@ else
 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 warp_pointer.cpp    \
+    auto_proc.cpp browser_widget.cpp child_iterator.cpp                    \
+    event_state_manager.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 warp_pointer.cpp                  \
     x_frame_buffer.cpp xml_utils.cpp xpcom_support.cpp
 csources := jquant2.c
 
@@ -48,13 +67,15 @@ sources_using_gtkmm :=                                                     \
     browser_widget.cpp generate_dvd.cpp pixbufs.cpp temp_file.cpp          \
     vob_list.cpp videolink.cpp warp_pointer.cpp
 sources_using_moz :=                                                       \
-    browser_widget.cpp child_iterator.cpp link_iterator.cpp                \
-    null_prompt_service.cpp style_sheets.cpp videolink.cpp xpcom_support.cpp
+    browser_widget.cpp child_iterator.cpp event_state_manager.cpp          \
+    link_iterator.cpp null_prompt_service.cpp style_sheets.cpp             \
+    videolink.cpp xpcom_support.cpp
 sources_using_moz_unstable := \
-    link_iterator.cpp null_prompt_service.cpp style_sheets.cpp videolink.cpp
+    browser_widget.cpp event_state_manager.cpp link_iterator.cpp           \
+    null_prompt_service.cpp style_sheets.cpp videolink.cpp
 
 videolink : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o)
-	$(CXX) $(LDFLAGS) -o $@ $^
+	$(CXX) $^ $(LDFLAGS) -o $@
 
 clean :
 	rm -rf .objs
@@ -62,7 +83,7 @@ clean :
 
 install :
 	mkdir -p -m 755 $(DESTDIR)$(bindir)
-	install -m 755 -s videolink $(DESTDIR)$(bindir)
+	install -m 755 $(if $(NDEBUG),-s,) videolink $(DESTDIR)$(bindir)
 	mkdir -p -m 755 $(DESTDIR)$(docdir)/videolink
 	gzip -c9 README >$(DESTDIR)$(docdir)/videolink/README.gz
 	gzip -c9 ChangeLog >$(DESTDIR)$(docdir)/videolink/ChangeLog.gz
@@ -84,21 +105,17 @@ $(sources_using_gtkmm:%.cpp=.objs/%.o) \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.4)
 
 $(sources_using_moz:%.cpp=.objs/%.o) \
-    : CPPFLAGS += $(shell pkg-config --cflags $(moz_pc))
+    : CPPFLAGS += $(filter-out -fshort-wchar, \
+		    $(shell pkg-config --cflags $(moz_pc)) $(moz_cppflags_extra))
 # Non-virtual destructors are fine in XPCOM interface classes since
 # instances are only ever called by the Release function which is virtual.
 $(sources_using_moz:%.cpp=.objs/%.o) : CXXFLAGS += -Wno-non-virtual-dtor
 
 $(sources_using_moz_unstable:%.cpp=.objs/%.o)                          \
-    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                   \
-                    content docshell dom gfx imglib2 layout locale     \
-                    necko uconv webshell widget)                       \
-		  -DMOZILLA_INTERNAL_API                               \
+    : CPPFLAGS += $(moz_unstable_cppflags_extra)                       \
                   -DMOZ_VERSION_MAJOR=$(moz_version_major)             \
-                  -DMOZ_VERSION_MINOR=$(moz_version_minor)
-
-.objs/%.d : .objs/.created
-	touch $@
+                  -DMOZ_VERSION_MINOR=$(moz_version_minor)             \
+                  -DMOZ_VERSION_MICRO=$(moz_version_micro)
 
 .objs/%.o : %.cpp .objs/.created
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -MD -MF .objs/$*.d -c $<
@@ -111,7 +128,7 @@ $(sources_using_moz_unstable:%.cpp=.objs/%.o)                          \
 	touch $@
 
 ifneq ($(MAKECMDGOALS),clean)
-    include $(cxxsources:%.cpp=.objs/%.d) $(csources:%.c=.objs/%.d)
+    -include $(cxxsources:%.cpp=.objs/%.d) $(csources:%.c=.objs/%.d)
 endif
 
 .PRECIOUS : %/.created