From 2a5da5d55db1559b908978b08f381ec92c60a8f8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 12 Apr 2008 14:43:05 +0000 Subject: [PATCH] Introduced variables for lists of sources using various libraries. --- Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index d5aaa56..96be00e 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,15 @@ cxxsources := \ 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 link_iterator.cpp \ + null_prompt_service.cpp style_sheets.cpp videolink.cpp xpcom_support.cpp +sources_using_moz_unstable := \ + link_iterator.cpp null_prompt_service.cpp style_sheets.cpp videolink.cpp + videolink : $(cxxsources:%.cpp=.objs/%.o) $(csources:%.c=.objs/%.o) $(CXX) $(LDFLAGS) -o $@ $^ @@ -71,24 +80,16 @@ install : .objs/videolink.% \ : CPPFLAGS += -DVIDEOLINK_SHARE_DIR='"$(sharedir)/videolink"' -.objs/browser_widget.% .objs/generate_dvd.% .objs/pixbufs.% \ -.objs/temp_file.% .objs/vob_list.% .objs/videolink.% .objs/warp_pointer.% \ +$(sources_using_gtkmm:%.cpp=.objs/%.o) \ : CPPFLAGS += $(shell pkg-config --cflags gtkmm-2.4) -.objs/browser_widget.% .objs/child_iterator.% .objs/link_iterator.% \ -.objs/null_prompt_service.% .objs/style_sheets.% .objs/videolink.% \ -.objs/xpcom_support.% \ +$(sources_using_moz:%.cpp=.objs/%.o) \ : CPPFLAGS += $(shell pkg-config --cflags $(moz_pc)) # 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/null_prompt_service.% .objs/style_sheets.% \ -.objs/videolink.% \ +$(sources_using_moz:%.cpp=.objs/%.o) : CXXFLAGS += -Wno-non-virtual-dtor + +$(sources_using_moz_unstable:%.cpp=.objs/%.o) \ : CPPFLAGS += $(addprefix -I$(moz_include_dir)/, \ content docshell dom gfx imglib2 layout locale \ necko uconv webshell widget) \ -- 2.39.2