From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 12 Nov 2005 15:44:53 +0000 (+0000)
Subject: Added webdvd_lib_dir variable.
X-Git-Tag: 0.2~1
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e183111b2101350b6e0b0b0cfb0fabd88dbad30c;p=videolink.git

Added webdvd_lib_dir variable.
Suppressed incorrect warnings.
---

diff --git a/Makefile b/Makefile
index 168ca2c..92f82ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 prefix := /usr/local
 
+webdvd_lib_dir := $(prefix)/lib/webdvd
+
 moz_include_dir := \
     $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
 moz_lib_dir := \
@@ -7,7 +9,9 @@ moz_lib_dir := \
 
 CFLAGS := -Wall
 CPPFLAGS := -D_REENTRANT
-CXXFLAGS := -Wall
+# Non-virtual destructors are fine in XPCOM interface classes since
+# instances are only ever called by the Release function which is virtual.
+CXXFLAGS := -Wall -Wno-non-virtual-dtor
 LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
            -Wl,-rpath -Wl,$(moz_lib_dir)
 
@@ -42,8 +46,7 @@ install :
 
 browserwidget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_lib_dir)"'
 
-webdvd.% \
-    : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(prefix)/lib/webdvd"'
+webdvd.% : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'
 
 browserwidget.% pixbufs.% webdvd.% \
     : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.0)