Introduced variables for lists of sources using various libraries.

diff --git a/Makefile b/Makefile
index d5aaa5650a26443c1ccf795b9091949dd7331018..96be00e5c58b256b9a42db9845f07e11588cbf5e 100644 (file)
--- 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)                       \