Guard gmake-specific syntax with IF_GNU_MAKE in make_dist.mk.

Debian distribution target uses GNU make extensions to make syntax which makes
the entire makefile impossible to use with other make versions, e.g. Solaris
make.

Fix this by prepending IF_GNU_MAKE to all Debian-specific lines, there should
be never any need to use them with non-GNU make.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index bca9393d3a949fc147dc7027dac89b6e30912595..1ecccecc197ef2908a00b0fc869fa1fa7d579104 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -40859,43 +40859,43 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI
        @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico
        @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp
 
-debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
-debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
-       mkdir $(DISTDIR)/debian
-       -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
-       $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
-       $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
-       $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
-       rm -f $(DISTDIR)/*.spec
-
-       @# now prune away a lot of the crap included by using cp -R
-       @# in other dist targets.  Ugly and hardly portable but it
-       @# will run on any Debian box and that's enough for now.
-
-       find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
-                          -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
-                          -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
-                          -o -name "*.pro"  \
-                          -o -name "*.vpj"  \
-                          -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
-                       \) -print0 | xargs -0 rm -rf
-
-       rm -rf $(DISTDIR)/wxPython/SWIG
-       rm -rf $(DISTDIR)/wxPython/distrib
-       rm -rf $(DISTDIR)/wxPython/distutils
-       rm -rf $(DISTDIR)/wxPython/samples
-       rm -rf $(DISTDIR)/wxPython/contrib/iewin
-       find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-
-       rm -rf $(DEBIAN_SOURCE_DIR)
-       mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
-
-
-debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
-
-debian-msw-dirs:
-       mkdir $(DISTDIR)/include/wx/msw
-       mkdir $(DISTDIR)/src/msw
+@IF_GNU_MAKE@debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
+@IF_GNU_MAKE@debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
+@IF_GNU_MAKE@  mkdir $(DISTDIR)/debian
+@IF_GNU_MAKE@  -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
+@IF_GNU_MAKE@  $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@  $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@  $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@  rm -f $(DISTDIR)/*.spec
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  @# now prune away a lot of the crap included by using cp -R
+@IF_GNU_MAKE@  @# in other dist targets.  Ugly and hardly portable but it
+@IF_GNU_MAKE@  @# will run on any Debian box and that's enough for now.
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
+@IF_GNU_MAKE@                     -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
+@IF_GNU_MAKE@                     -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
+@IF_GNU_MAKE@                     -o -name "*.pro"  \
+@IF_GNU_MAKE@                     -o -name "*.vpj"  \
+@IF_GNU_MAKE@                     -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
+@IF_GNU_MAKE@                  \) -print0 | xargs -0 rm -rf
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/SWIG
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/distrib
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/distutils
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/samples
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/contrib/iewin
+@IF_GNU_MAKE@  find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  rm -rf $(DEBIAN_SOURCE_DIR)
+@IF_GNU_MAKE@  mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
+
+
+@IF_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+
+@IF_GNU_MAKE@debian-msw-dirs:
+@IF_GNU_MAKE@  mkdir $(DISTDIR)/include/wx/msw
+@IF_GNU_MAKE@  mkdir $(DISTDIR)/src/msw
 
 
 RPMTOP=_dist_dir/_rpm_top

diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index f820a7acc86c14e8f4a6e72b0ffedb5184c039a6..669bf6909e74d329c644d220813b47d4b8c9e9db 100644 (file)
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -876,43 +876,43 @@ win-dist: MSW_ZIP_TEXT_DIST SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST INTL_DI
        @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.ico
        @cd _dist_dir && zip -r ../$(WXARCHIVE_ZIP) wxMSW/include/wx/msw/*.bmp
 
-debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
-debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
-       mkdir $(DISTDIR)/debian
-       -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
-       $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
-       $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
-       $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
-       rm -f $(DISTDIR)/*.spec
-
-       @# now prune away a lot of the crap included by using cp -R
-       @# in other dist targets.  Ugly and hardly portable but it
-       @# will run on any Debian box and that's enough for now.
-
-       find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
-                          -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
-                          -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
-                          -o -name "*.pro"  \
-                          -o -name "*.vpj"  \
-                          -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
-                       \) -print0 | xargs -0 rm -rf
-
-       rm -rf $(DISTDIR)/wxPython/SWIG
-       rm -rf $(DISTDIR)/wxPython/distrib
-       rm -rf $(DISTDIR)/wxPython/distutils
-       rm -rf $(DISTDIR)/wxPython/samples
-       rm -rf $(DISTDIR)/wxPython/contrib/iewin
-       find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
-
-       rm -rf $(DEBIAN_SOURCE_DIR)
-       mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
-
-
-debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
-
-debian-msw-dirs:
-       mkdir $(DISTDIR)/include/wx/msw
-       mkdir $(DISTDIR)/src/msw
+@IF_GNU_MAKE@debian-dist: DEBIAN_SOURCE_DIR = $(WXDIR)/../wxwidgets@WX_RELEASE@@WX_FLAVOUR@-@WX_SUBVERSION@
+@IF_GNU_MAKE@debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
+@IF_GNU_MAKE@  mkdir $(DISTDIR)/debian
+@IF_GNU_MAKE@  -$(CP_P) $(WXDIR)/debian/* $(DISTDIR)/debian
+@IF_GNU_MAKE@  $(CP_P) $(DOCDIR)/licence.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@  $(CP_P) $(DOCDIR)/licendoc.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@  $(CP_P) $(DOCDIR)/preamble.txt $(DISTDIR)/docs
+@IF_GNU_MAKE@  rm -f $(DISTDIR)/*.spec
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  @# now prune away a lot of the crap included by using cp -R
+@IF_GNU_MAKE@  @# in other dist targets.  Ugly and hardly portable but it
+@IF_GNU_MAKE@  @# will run on any Debian box and that's enough for now.
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp"    \
+@IF_GNU_MAKE@                     -o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms"    \
+@IF_GNU_MAKE@                     -o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r"    \
+@IF_GNU_MAKE@                     -o -name "*.pro"  \
+@IF_GNU_MAKE@                     -o -name "*.vpj"  \
+@IF_GNU_MAKE@                     -o \( -name "makefile.*" -a ! -name "makefile.unx" \) \
+@IF_GNU_MAKE@                  \) -print0 | xargs -0 rm -rf
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/SWIG
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/distrib
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/distutils
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/samples
+@IF_GNU_MAKE@  rm -rf $(DISTDIR)/wxPython/contrib/iewin
+@IF_GNU_MAKE@  find $(DISTDIR)/wxPython \( -name "mac" -o -name "msw" \) -print0 | xargs -0 rm -rf
+@IF_GNU_MAKE@
+@IF_GNU_MAKE@  rm -rf $(DEBIAN_SOURCE_DIR)
+@IF_GNU_MAKE@  mv $(DISTDIR) $(DEBIAN_SOURCE_DIR)
+
+
+@IF_GNU_MAKE@debian-native-dist: @GUIDIST@ UNIV_DIST MANUAL_DIST PYTHON_DIST
+
+@IF_GNU_MAKE@debian-msw-dirs:
+@IF_GNU_MAKE@  mkdir $(DISTDIR)/include/wx/msw
+@IF_GNU_MAKE@  mkdir $(DISTDIR)/src/msw
 
 
 RPMTOP=_dist_dir/_rpm_top

diff --git a/build/msw/wx_base.dsp b/build/msw/wx_base.dsp
index 9bfbf020639c63f8c6ff4ba497694d7765a99060..3b0161a7f73eb9598dcf173b85b10cb8a238ced2 100644 (file)
--- a/build/msw/wx_base.dsp
+++ b/build/msw/wx_base.dsp
@@ -1475,10 +1475,10 @@ SOURCE=..\..\include\wx\regex.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\include\wx\meta\removeref.h
-# End Source File
-# Begin Source File
-
+SOURCE=..\..\include\wx\meta\removeref.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\include\wx\rtti.h\r
 # End Source File\r
 # Begin Source File\r