X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=c2504909dda5fb253024b6b09370970adcb9edf5;hb=b409f253ecd2899fe61a78739a0d4123f5c21702;hp=d0bd9971c12474713a2fc3c1a9a15d40f753a541;hpb=d67e544e6a97be82fad02b80625eb17692dec87a;p=videolink.git diff --git a/Makefile b/Makefile index d0bd997..c250490 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,9 @@ 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) else ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes) moz_name := xulrunner @@ -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 @@ -108,7 +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) + -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 $<