X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=Makefile;h=380c7a04a59424e293c7394aac6fa4f8bb7a0869;hp=069a59fa8a2114f26dd4f12b55bc8220058d4af3;hb=HEAD;hpb=5746a18015788678b85907421f91adf249ea71d3 diff --git a/Makefile b/Makefile index 069a59f..380c7a0 100644 --- a/Makefile +++ b/Makefile @@ -5,23 +5,47 @@ sharedir := $(prefix)/share docdir := $(sharedir)/doc mandir := $(sharedir)/man -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_version := \ - $(shell sed 's/\#define MOZILLA_VERSION "\(.*\)"/\1/; t; d' \ - < $(moz_include_dir)/mozilla-config.h) +ifeq ($(shell pkg-config --atleast-version 1.9 mozilla-gtkmozembed-embedding && echo yes),yes) + moz_name := xulrunner-1.9 + moz_pc := mozilla-gtkmozembed-embedding + moz_cppflags_extra := $(shell pkg-config --cflags xulrunner-nspr) -DXPCOM_GLUE_USE_NSPR + moz_unstable_cppflags_extra := + moz_ldflags_extra := $(shell pkg-config --libs xulrunner-nspr) + # 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 + moz_pc := xulrunner-gtkmozembed + else + moz_name := mozilla + moz_pc := mozilla-gtkmozembed + endif + moz_unstable_cppflags_extra = \ + $(addprefix -I$(moz_include_dir)/, \ + content docshell dom gfx imglib2 layout locale necko uconv webshell widget) \ + -DMOZILLA_INTERNAL_API + moz_ldflags_extra = -Wl,-rpath,$(moz_lib_dir) +endif + +moz_prefix := $(shell pkg-config --variable=prefix $(moz_pc)) +moz_include_dir := $(shell pkg-config --variable=includedir $(moz_pc)) +moz_lib_dir := $(moz_prefix)/lib/$(moz_name) + +moz_version := $(shell pkg-config --modversion $(moz_pc)) +# HACK: Replace 'b' for beta with micro=-1 +moz_version := $(subst b,.-1.,$(moz_version)) moz_version_major := $(word 1,$(subst ., ,$(moz_version))) moz_version_minor := $(word 2,$(subst ., ,$(moz_version))) -moz_version_patchlevel := $(word 3,$(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.0 mozilla-gtkmozembed) \ - -Wl,-rpath -Wl,$(moz_lib_dir) -lexpat +LDFLAGS := -lpthread \ + $(shell pkg-config --libs gtkmm-2.4 $(moz_pc)) \ + $(moz_ldflags_extra) -lexpat -lX11 ifdef NDEBUG CPPFLAGS += -DNDEBUG @@ -32,14 +56,26 @@ else 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 videolink.cpp x_frame_buffer.cpp \ - xml_utils.cpp xpcom_support.cpp + auto_proc.cpp browser_widget.cpp child_iterator.cpp \ + event_state_manager.cpp generate_dvd.cpp link_iterator.cpp \ + null_prompt_service.cpp pixbufs.cpp style_sheets.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 +sources_using_gtkmm := \ + browser_widget.cpp generate_dvd.cpp pixbufs.cpp temp_file.cpp \ + vob_list.cpp videolink.cpp warp_pointer.cpp +sources_using_moz := \ + browser_widget.cpp child_iterator.cpp event_state_manager.cpp \ + link_iterator.cpp null_prompt_service.cpp style_sheets.cpp \ + videolink.cpp xpcom_support.cpp +sources_using_moz_unstable := \ + browser_widget.cpp event_state_manager.cpp link_iterator.cpp \ + null_prompt_service.cpp style_sheets.cpp videolink.cpp + videolink : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o) - $(CXX) $(LDFLAGS) -o $@ $^ + $(CXX) $^ $(LDFLAGS) -o $@ clean : rm -rf .objs @@ -47,7 +83,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 @@ -56,58 +92,43 @@ install : 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 + install -m 644 *.css $(DESTDIR)$(sharedir)/videolink .PHONY : clean install .objs/browser_widget.% : CPPFLAGS += -DMOZ_LIB_DIR='"$(moz_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/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.% \ - : 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) + : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"' -.objs/null_prompt_service.% : CPPFLAGS += -I$(moz_include_dir)/uconv +$(sources_using_gtkmm:%.cpp=.objs/%.o) \ + : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.4) -.objs/%.d : %.cpp .objs/.created - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM -MF $@ $< +$(sources_using_moz:%.cpp=.objs/%.o) \ + : CPPFLAGS += $(filter-out -fshort-wchar, \ + $(shell pkg-config --cflags $(moz_pc)) $(moz_cppflags_extra)) +# Non-virtual destructors are fine in XPCOM interface classes since +# instances are only ever called by the Release function which is virtual. +$(sources_using_moz:%.cpp=.objs/%.o) : CXXFLAGS += -Wno-non-virtual-dtor -.objs/%.d : %.c .objs/.created - $(CC) $(CFLAGS) $(CPPFLAGS) -MM -MF $@ $< +$(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_MICRO=$(moz_version_micro) .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 $* touch $@ ifneq ($(MAKECMDGOALS),clean) - include $(cxxsources:%.cpp=.objs/%.d) $(csources:%.c=.objs/%.d) + -include $(cxxsources:%.cpp=.objs/%.d) $(csources:%.c=.objs/%.d) endif .PRECIOUS : %/.created