On 'make clean' don't remove the resource file on OS/2
(It's shared between all apps!). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1373,6 +1373,7 @@ case "${host}" in
|
||||
else
|
||||
dnl Include resources for the "native" port (wxPM).
|
||||
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
|
||||
CLEANRESPROGRAMOBJ=""
|
||||
fi
|
||||
AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[
|
||||
AC_TRY_COMPILE([],
|
||||
@@ -2050,6 +2051,7 @@ if test "$USE_WIN32" = 1 ; then
|
||||
|
||||
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
|
||||
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
|
||||
CLEANRESPROGRAMOBJ=${RESPROGRAMOBJ}
|
||||
|
||||
dnl install Win32-specific files in "make install"
|
||||
WIN32INSTALL=win32install
|
||||
@@ -5515,6 +5517,7 @@ dnl additional resurces settings
|
||||
AC_SUBST(RESCOMP)
|
||||
AC_SUBST(RESFLAGS)
|
||||
AC_SUBST(RESPROGRAMOBJ)
|
||||
AC_SUBST(CLEANRESPROGRAMOBJ)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
|
||||
AC_SUBST(WX_RESOURCES_MACOSX_DATA)
|
||||
|
||||
|
@@ -4,6 +4,7 @@
|
||||
PROGRAM_EXT = @PROGRAM_EXT@
|
||||
BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
|
||||
RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
|
||||
CLEAN_RES_PROGRAM_OBJ = @CLEANRESPROGRAMOBJ@
|
||||
BUNDLE = $(BIN_PROGRAM).app/Contents
|
||||
|
||||
# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
|
||||
@@ -49,7 +50,7 @@ install_data:
|
||||
done
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core
|
||||
rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(CLEAN_RES_PROGRAM_OBJ) core
|
||||
|
||||
#
|
||||
# Targets to build a Mac OS X application bundle
|
||||
|
Reference in New Issue
Block a user