X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Makefile;h=02a8030579a95f16fc063525b4ffb587a983bf28;hb=3a7baf39d3211c0bda3de1ab2b657e024a35b8af;hp=bc262931adc265853e58bca4479e30bcaa8ab33d;hpb=5ed622e8817112e0e2203a3260eb75b14bd3173f;p=videolink.git diff --git a/Makefile b/Makefile index bc26293..02a8030 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,20 @@ prefix := /usr/local -webdvd_lib_dir := $(prefix)/lib/webdvd +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 @@ -33,62 +41,71 @@ 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 \ - xml_utils.cpp xpcom_support.cpp + temp_file.cpp video.cpp vob_list.cpp videolink.cpp warp_pointer.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 *.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)"' \ - -DMOZ_VERSION_MAJOR=$(moz_version_major) \ - -DMOZ_VERSION_MINOR=$(moz_version_minor) \ - -DMOZ_VERSION_PATCHLEVEL=$(moz_version_patchlevel) +.objs/videolink.% \ + : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"' -.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \ -.objs/temp_file.% .objs/vob_list.% .objs/webdvd.% \ +.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \ +.objs/temp_file.% .objs/vob_list.% .objs/videolink.% .objs/warp_pointer.% \ : 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/webdvd.% \ +.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/webdvd.% \ - : 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/%.d : %.cpp .objs/.created - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM -MF $@ $< +.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 : %.c .objs/.created - $(CC) $(CFLAGS) $(CPPFLAGS) -MM -MF $@ $< +.objs/%.d : .objs/.created + touch $@ .objs/%.o : %.cpp .objs/.created - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $< + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $@ -MD -MF .objs/$*.d -c $< .objs/%.o : %.c .objs/.created - $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< + $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -MD -MF .objs/$*.d -c $< %/.created : mkdir -p $*