X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=81566a7d843db5cb5e476dd2b3e47044cca68244;hp=671ba39eb54822373cb10e0df8994ce41a1da9f7;hb=194f5f8a53d16a8a07c61df2311a13b3cd3994bf;hpb=4b8bff9ce93df43b120c5cf4d1476d3a435f99d3

diff --git a/Makefile b/Makefile
index 671ba39..81566a7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,20 @@
 prefix := /usr/local
 
-videolink_lib_dir := $(prefix)/lib/videolink
+bindir := $(prefix)/bin
+sharedir := $(prefix)/share
+docdir := $(sharedir)/doc
+mandir := $(sharedir)/man
+
+# Prefer XULRunner to the old Mozilla
+ifeq ($(shell pkg-config --exists xulrunner-gtkmozembed && echo yes),yes)
+    mozilla := xulrunner
+else
+    mozilla := mozilla
+endif
 
-moz_include_dir := \
-    $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
-moz_lib_dir := \
-    $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/lib/mozilla
+moz_prefix := $(shell pkg-config --variable=prefix $(mozilla)-gtkmozembed)
+moz_include_dir := $(moz_prefix)/include/$(mozilla)
+moz_lib_dir := $(moz_prefix)/lib/$(mozilla)
 
 moz_version := \
     $(shell sed 's/\#define MOZILLA_VERSION "\(.*\)"/\1/; t; d' \
@@ -14,12 +23,11 @@ moz_version_major := $(word 1,$(subst ., ,$(moz_version)))
 moz_version_minor := $(word 2,$(subst ., ,$(moz_version)))
 moz_version_patchlevel := $(word 3,$(subst ., ,$(moz_version)))
 
-CFLAGS := -ansi -Wall
+CFLAGS := -ansi -Wall -Wunused -Wno-unused-parameter
 CPPFLAGS := -D_REENTRANT
-# Non-virtual destructors are fine in XPCOM interface classes since
-# instances are only ever called by the Release function which is virtual.
-CXXFLAGS := -ansi -Wall -Wno-non-virtual-dtor
-LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
+CXXFLAGS := -ansi -Wall -Wunused
+LDFLAGS := -lpthread                                                   \
+           $(shell pkg-config --libs gtkmm-2.0 $(mozilla)-gtkmozembed) \
            -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
 
 ifdef NDEBUG
@@ -44,39 +52,51 @@ clean :
 	rm -rf .objs
 	rm -f videolink *~ .\#* *.orig *.rej svn-commit*.tmp
 
-distclean : clean
-	rm -rf .svn
-
 install :
-	mkdir -p -m 755 $(prefix)/bin $(videolink_lib_dir)
-	install -m 755 -s videolink $(prefix)/bin
-	install -m 644 videolink.css $(videolink_lib_dir)
-
-.PHONY : clean distclean install
+	mkdir -p -m 755 $(DESTDIR)$(bindir)
+	install -m 755 -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
+	chmod 644 $(DESTDIR)$(docdir)/videolink/*.gz
+	mkdir -p -m 755 $(DESTDIR)$(mandir)/man1
+	gzip -c9 videolink.1 >$(DESTDIR)$(mandir)/man1/videolink.1.gz
+	chmod 644 $(DESTDIR)$(mandir)/man1/videolink.1.gz
+	mkdir -p -m 755 $(DESTDIR)$(sharedir)/videolink
+	install -m 644 videolink.css $(DESTDIR)$(sharedir)/videolink
+
+.PHONY : clean install
 
 .objs/browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
 .objs/videolink.% \
-    : CPPFLAGS += -DVIDEOLINK_LIB_DIR='"$(videolink_lib_dir)"'       \
-                  -DMOZ_VERSION_MAJOR=$(moz_version_major)           \
-                  -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
-                  -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
+    : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"'
 
 .objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \
 .objs/temp_file.% .objs/vob_list.% .objs/videolink.%        \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)
 
+.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.%   \
+.objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.%    \
+.objs/xpcom_support.%                                                 \
+    : CPPFLAGS += $(shell pkg-config --cflags $(mozilla)-gtkmozembed)
+# Non-virtual destructors are fine in XPCOM interface classes since
+# instances are only ever called by the Release function which is virtual.
 .objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \
 .objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.%  \
 .objs/xpcom_support.%                                               \
-    : CPPFLAGS += $(shell pkg-config --cflags mozilla-gtkmozembed)
+    : CXXFLAGS += -Wno-non-virtual-dtor
 
 # These dig a bit deeper into Mozilla
-.objs/link_iterator.% .objs/style_sheets.% .objs/videolink.%               \
-    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                       \
-                    content docshell dom gfx layout necko webshell widget)
-
-.objs/null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv
+.objs/link_iterator.% .objs/null_prompt_service.% .objs/style_sheets.% \
+.objs/videolink.%                                                      \
+    : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                   \
+                    content docshell dom gfx layout locale necko uconv \
+                    webshell widget)                                   \
+		  -DMOZILLA_INTERNAL_API                               \
+                  -DMOZ_VERSION_MAJOR=$(moz_version_major)             \
+                  -DMOZ_VERSION_MINOR=$(moz_version_minor)             \
+                  -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
 
 .objs/%.d : %.cpp .objs/.created
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM -MF $@ $<