X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=069a59fa8a2114f26dd4f12b55bc8220058d4af3;hb=5746a18015788678b85907421f91adf249ea71d3;hp=bc262931adc265853e58bca4479e30bcaa8ab33d;hpb=5ed622e8817112e0e2203a3260eb75b14bd3173f;p=videolink.git

diff --git a/Makefile b/Makefile
index bc26293..069a59f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 prefix := /usr/local
 
-webdvd_lib_dir := $(prefix)/lib/webdvd
+bindir := $(prefix)/bin
+sharedir := $(prefix)/share
+docdir := $(sharedir)/doc
+mandir := $(sharedir)/man
 
 moz_include_dir := \
     $(shell pkg-config --variable=prefix mozilla-gtkmozembed)/include/mozilla
@@ -14,11 +17,9 @@ 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
+CXXFLAGS := -ansi -Wall -Wunused
 LDFLAGS := -lpthread $(shell pkg-config --libs gtkmm-2.0 mozilla-gtkmozembed) \
            -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat
 
@@ -33,46 +34,57 @@ endif
 cxxsources := \
     auto_proc.cpp browser_widget.cpp child_iterator.cpp generate_dvd.cpp   \
     link_iterator.cpp null_prompt_service.cpp pixbufs.cpp style_sheets.cpp \
-    temp_file.cpp video.cpp vob_list.cpp webdvd.cpp x_frame_buffer.cpp     \
+    temp_file.cpp video.cpp vob_list.cpp videolink.cpp x_frame_buffer.cpp  \
     xml_utils.cpp xpcom_support.cpp
 csources := jquant2.c
 
-webdvd : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o)
+videolink : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o)
 	$(CXX) $(LDFLAGS) -o $@ $^
 
 clean :
 	rm -rf .objs
-	rm -f webdvd *~ .\#* *.orig *.rej svn-commit*.tmp
-
-distclean : clean
-	rm -rf .svn
+	rm -f videolink *~ .\#* *.orig *.rej svn-commit*.tmp
 
 install :
-	mkdir -p -m 755 $(prefix)/bin $(prefix)/lib/webdvd
-	install -m 755 -s webdvd $(prefix)/bin
-	install -m 644 webdvd.css $(prefix)/lib/webdvd
-
-.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/webdvd.% \
-    : CPPFLAGS += -DWEBDVD_LIB_DIR='"$(webdvd_lib_dir)"'             \
+.objs/videolink.% \
+    : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"'    \
                   -DMOZ_VERSION_MAJOR=$(moz_version_major)           \
                   -DMOZ_VERSION_MINOR=$(moz_version_minor)           \
                   -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel)
 
 .objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \
-.objs/temp_file.% .objs/vob_list.% .objs/webdvd.%           \
+.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/webdvd.%	    \
+.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.%                                               \
+    : CXXFLAGS += -Wno-non-virtual-dtor
 
 # These dig a bit deeper into Mozilla
-.objs/link_iterator.% .objs/style_sheets.% .objs/webdvd.%                  \
+.objs/link_iterator.% .objs/style_sheets.% .objs/videolink.%               \
     : CPPFLAGS += $(addprefix -I$(moz_include_dir)/,                       \
                     content docshell dom gfx layout necko webshell widget)