Convert to one-shot C++ compilation with dependency tracking.

diff --git a/ChangeLog b/ChangeLog
index 46faf95..09b8254 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2013-08-19  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
+       Convert to one-shot C++ compilation with dependency tracking.
+
+       * Makefile.in (DEPFLAGS): Redefine; incorporate CPPFLAGS.
+       (hsashctl.$OBJEXT vsashctl.$OBJEXT): Use it in place of CPPFLAGS.
+       (%.$OBJEXT): Likewise; delete separate dependency tracking command.
+
+2013-08-19  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
        Add facility for activation of a running application window.
 
        * wtkdefs.h: New file; it defines...

diff --git a/Makefile.in b/Makefile.in
index c8724b5..5589ce8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,7 @@ VERSION = @PACKAGE_VERSION@
 # $Id$
 #
 # Written by Keith Marshall <keithmarshall@users.sourceforge.net>
-# Copyright (C) 2012, MinGW.org Project.
+# Copyright (C) 2012, 2013, MinGW.org Project.
 #
 # ---------------------------------------------------------------------------
 #
@@ -71,7 +71,7 @@ libwtklite.a: $(LIBWTK_OBJECTS)
 
 # Compilation and dependency tracking...
 #
-DEPFLAGS = -MM -MP -MD
+DEPFLAGS = -MMD -MP $(CPPFLAGS)
 sinclude *.d
 
 # Implementations for horizontal and vertical sash bar controls are
@@ -81,16 +81,15 @@ HSASH_IMPLEMENTATION = -D HSASH_IMPLEMENTATION ${srcdir}/sashctrl.cpp
 VSASH_IMPLEMENTATION = -D VSASH_IMPLEMENTATION ${srcdir}/sashctrl.cpp
 
 hsashctl.$(OBJEXT): sashctrl.cpp sashctrl.o
-       $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $(HSASH_IMPLEMENTATION)
+       $(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $(HSASH_IMPLEMENTATION)
 
 vsashctl.$(OBJEXT): sashctrl.cpp sashctrl.o
-       $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $(VSASH_IMPLEMENTATION)
+       $(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $(VSASH_IMPLEMENTATION)
 
 # Other object modules may be implicitly compiled.
 #
 %.$(OBJEXT): %.cpp
-       $(CXX) $(DEPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $<
-       $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
+       $(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<
 
 # Installation rules.
 #