X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=72ce8390958b463dc5a16a04b2a6e5faa9494ec5;hb=b4878dceb480836e59032998bf1214f4f015d5ae;hp=d0bd9971c12474713a2fc3c1a9a15d40f753a541;hpb=d67e544e6a97be82fad02b80625eb17692dec87a;p=videolink.git

diff --git a/Makefile b/Makefile
index d0bd997..72ce839 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,9 @@ ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding &&
     moz_pc := mozilla-gtkmozembed-embedding
     moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr)
     moz_unstable_cppflags_extra :=
-    moz_ldflags_extra :=
+    # 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 +35,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 +80,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 +111,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 $<