[lmi-commits] [5215] Rename msw resource file

[Greg Chicares]

Revision: 5215
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5215
Author:   chicares
Date:     2011-06-23 10:36:23 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
Rename msw resource file

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/Makefile.am
    lmi/trunk/objects.make
    lmi/trunk/workhorse.make

Added Paths:
-----------
    lmi/trunk/lmi_msw_res.rc

Removed Paths:
-------------
    lmi/trunk/lmi.rc

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2011-06-22 19:10:30 UTC (rev 5214)
+++ lmi/trunk/ChangeLog 2011-06-23 10:36:23 UTC (rev 5215)
@@ -28054,3 +28054,12 @@
 No longer follow documented advice that turned out to be wrong. See:
   http://lists.nongnu.org/archive/html/lmi/2011-06/msg00040.html
 
+20110623T1036Z <address@hidden> [649]
+
+  Makefile.am
+  lmi.rc [renamed to 'lmi_msw_res.rc']
+  objects.make
+  workhorse.make
+Rename msw resource file. See:
+  http://lists.nongnu.org/archive/html/lmi/2011-06/msg00036.html
+

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2011-06-22 19:10:30 UTC (rev 5214)
+++ lmi/trunk/Makefile.am       2011-06-23 10:36:23 UTC (rev 5215)
@@ -207,7 +207,7 @@
 .rc.o:
        $(WINDRES) -I $(top_srcdir) $(WX_CPPFLAGS) $< $@
 
-    lmi_wx_SOURCES += lmi.rc
+    lmi_wx_SOURCES += lmi_msw_res.rc
     lmi_wx_CXXFLAGS += -mwindows
 endif
 lmi_wx_LDADD = \
@@ -218,7 +218,7 @@
     $(BOOST_LIBS) \
     $(WX_LIBS)
 if LMI_MSW
-    lmi_wx_SOURCES += lmi.rc
+    lmi_wx_SOURCES += lmi_msw_res.rc
     lmi_wx_CXXFLAGS += -mwindows
 endif
 

Deleted: lmi/trunk/lmi.rc
===================================================================
--- lmi/trunk/lmi.rc    2011-06-22 19:10:30 UTC (rev 5214)
+++ lmi/trunk/lmi.rc    2011-06-23 10:36:23 UTC (rev 5215)
@@ -1,40 +0,0 @@
-// Trivial msw resource file for wxWindows.
-//
-// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 
Gregory W. Chicares.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 2 as
-// published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software Foundation,
-// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-//
-// http://savannah.nongnu.org/projects/lmi
-// email: <address@hidden>
-// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
-
-// $Id$
-
-// To make msw use this:
-AAAAAAAA ICON "lmi.ico"
-// as the application's icon e.g. for 'explorer', make sure it's both
-// the first icon alphabetically and the first defined in the resource
-// file, for reasons explained here:
-//   http://groups.google.com/groups?selm=a825ce%244iqj%241%40as201.hinet.hr
-// On the msw platform, this icon must be embedded in the application
-// binary. Other icons are treated the same way here, not because they
-// must be, but simply as a matter of consistency and convenience.
-
-// Get stock cursors etc. Unconventionally, write this #include
-// directive at the end of this file, to prevent any ICON statements
-// in the included file from preceding the application's icon--which
-// would be bad for reasons explained above.
-//
-#include <wx/msw/wx.rc>
-

Copied: lmi/trunk/lmi_msw_res.rc (from rev 5144, lmi/trunk/lmi.rc)
===================================================================
--- lmi/trunk/lmi_msw_res.rc                            (rev 0)
+++ lmi/trunk/lmi_msw_res.rc    2011-06-23 10:36:23 UTC (rev 5215)
@@ -0,0 +1,40 @@
+// Trivial msw resource file for wxWindows.
+//
+// Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 
Gregory W. Chicares.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+//
+// http://savannah.nongnu.org/projects/lmi
+// email: <address@hidden>
+// snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
+
+// $Id$
+
+// To make msw use this:
+AAAAAAAA ICON "lmi.ico"
+// as the application's icon e.g. for 'explorer', make sure it's both
+// the first icon alphabetically and the first defined in the resource
+// file, for reasons explained here:
+//   http://groups.google.com/groups?selm=a825ce%244iqj%241%40as201.hinet.hr
+// On the msw platform, this icon must be embedded in the application
+// binary. Other icons are treated the same way here, not because they
+// must be, but simply as a matter of consistency and convenience.
+
+// Get stock cursors etc. Unconventionally, write this #include
+// directive at the end of this file, to prevent any ICON statements
+// in the included file from preceding the application's icon--which
+// would be bad for reasons explained above.
+//
+#include <wx/msw/wx.rc>
+

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2011-06-22 19:10:30 UTC (rev 5214)
+++ lmi/trunk/objects.make      2011-06-23 10:36:23 UTC (rev 5215)
@@ -342,7 +342,7 @@
   wx_utility.o \
 
 ifneq (,$(RC))
-  lmi_wx_objects += lmi.rc.o
+  lmi_wx_objects += lmi_msw_res.o
 endif
 
 
################################################################################

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2011-06-22 19:10:30 UTC (rev 5214)
+++ lmi/trunk/workhorse.make    2011-06-23 10:36:23 UTC (rev 5215)
@@ -741,7 +741,7 @@
        $(CXX) $(MAKEDEPEND_FLAGS) -c $(ALL_CPPFLAGS) $(ALL_CXXFLAGS) $< -o$@
        $($(MAKEDEPEND_COMMAND))
 
-%.rc.o: %.rc
+%.o: %.rc
        $(RC) -o $@ $(ALL_RCFLAGS) -i $<
        $(MAKEDEPEND_NON_GCC_COMMAND)
 
@@ -829,7 +829,7 @@
 # TODO ?? This needs a corresponding test target.
 lmi_cgi$(EXEEXT): $(cgi_objects) $(lmi_common_objects)
 
-lmi.rc.o: lmi.ico
+lmi_msw_res.o: lmi.ico
 
 
################################################################################