Adjust incorrectly resolved 2012-09-14 merge from master.

diff --git a/ChangeLog b/ChangeLog
index 79f5f42..0368aa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-20  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Adjust incorrectly resolved 2012-09-14 merge from master.
+
+       * src/Makefile.in: Restore lost reference to guistub.cpp
+
 2012-09-14  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Implement GUI hooks in "rites of passage" internal API.

diff --git a/Makefile.in b/Makefile.in
index c039fc2..af717d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -97,7 +97,7 @@ GUI_LDFLAGS = -mwindows $(LDFLAGS)
 %.$(OBJEXT): %.ico
        echo $* ICON $*.ico | $(WINDRES) -I ${srcdir}/icons -o $@
 #
-gui$(EXEEXT): guimain.$(OBJEXT) pkgicon.$(OBJEXT)
+gui$(EXEEXT): guistub.$(OBJEXT) pkgicon.$(OBJEXT)
        $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+
 
 lastrites$(EXEEXT): rites.$(OBJEXT)