Only strip at installation time if NDEBUG is defined - closes: #438252

[videolink.git] / Makefile

diff --git a/Makefile b/Makefile
index bf159592a6cfc8ae6eae67a562ed174a07c566c8..ddfa5aa40deb3c1b7e2ce00011e3d428eae43fc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,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 +99,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
@@ -109,9 +110,6 @@ $(sources_using_moz_unstable:%.cpp=.objs/%.o)                          \
                   -DMOZ_VERSION_MAJOR=$(moz_version_major)             \
                   -DMOZ_VERSION_MINOR=$(moz_version_minor)
 
-.objs/%.d : .objs/.created
-       touch $@
-
 .objs/%.o : %.cpp .objs/.created
        $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -MD -MF .objs/$*.d -c $<
 
@@ -123,7 +121,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