X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=b9b794e98d71f5feee19a39f6304a441c21a627f;hb=9aa30b92f22ae1be3975ba6f615557d44aee4a7b;hp=bf159592a6cfc8ae6eae67a562ed174a07c566c8;hpb=9d2e69a1cf5011f52ae8ec6f5a45c5ddc39ac112;p=videolink.git

diff --git a/Makefile b/Makefile
index bf15959..b9b794e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,7 @@ 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
@@ -77,7 +78,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 +100,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,10 +109,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)
-
-.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 $<
@@ -123,7 +123,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