X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=7238b7b3739ca5aa4ec7fdf4cd8f2d499713bf65;hp=9a62d7e2be49e66ebe55aaa3ecf06c2bfa37291e;hb=cd758c798d0c48f8161e5102faf8d862ba76aa2d;hpb=1363abe723ead6b64896ccd0e7875c4ae8bca706

diff --git a/Makefile b/Makefile
index 9a62d7e..7238b7b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,9 +8,12 @@ mandir := $(sharedir)/man
 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)
+    moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR
     moz_unstable_cppflags_extra :=
-    moz_ldflags_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
@@ -33,13 +36,14 @@ moz_lib_dir := $(moz_prefix)/lib/$(moz_name)
 moz_version := $(shell pkg-config --modversion $(moz_pc))
 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))	\
-           $(moz_ldflags_extra) -lexpat
+           $(moz_ldflags_extra) -lexpat -lX11
 
 ifdef NDEBUG
     CPPFLAGS += -DNDEBUG
@@ -77,7 +81,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
@@ -99,7 +103,8 @@ $(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)) $(moz_cppflags_extra)
+    : 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
@@ -107,7 +112,8 @@ $(sources_using_moz:%.cpp=.objs/%.o) : CXXFLAGS += -Wno-non-virtual-dtor
 $(sources_using_moz_unstable:%.cpp=.objs/%.o)                          \
     : CPPFLAGS += $(moz_unstable_cppflags_extra)                       \
                   -DMOZ_VERSION_MAJOR=$(moz_version_major)             \
-                  -DMOZ_VERSION_MINOR=$(moz_version_minor)
+                  -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 $<