allow building wxWin with non-GNU make (which doesn't support -include)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -375,8 +375,7 @@ lexer.c: $(COMMDIR)/lexer.l
|
|||||||
sed -e "s/unput/PROIO_unput/g" > lexer.c
|
sed -e "s/unput/PROIO_unput/g" > lexer.c
|
||||||
@$(RM) @LEX_STEM@.c
|
@$(RM) @LEX_STEM@.c
|
||||||
|
|
||||||
-include $(OBJECTS:.o=.d)
|
@IF_GNU_MAKE@-include $(OBJECTS:.o=.d)
|
||||||
|
|
||||||
|
|
||||||
CREATE_INSTALLED_LINKS: preinstall
|
CREATE_INSTALLED_LINKS: preinstall
|
||||||
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
||||||
|
19
configure.in
19
configure.in
@@ -1249,6 +1249,25 @@ you are trying to compile.
|
|||||||
])
|
])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl does make support "-include" (only GNU make does AFAIK)?
|
||||||
|
AC_CACHE_CHECK([if make is GNU make], wx_make_make_isgnu,
|
||||||
|
[
|
||||||
|
if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null |
|
||||||
|
grep GNU 2>&1 > /dev/null); then
|
||||||
|
wx_make_make_isgnu="yes"
|
||||||
|
else
|
||||||
|
wx_make_make_isgnu="no"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
if test "x$wx_make_make_isgnu" = "xyes"; then
|
||||||
|
IF_GNU_MAKE=""
|
||||||
|
else
|
||||||
|
IF_GNU_MAKE="#"
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(IF_GNU_MAKE)
|
||||||
|
|
||||||
dnl YACC checks
|
dnl YACC checks
|
||||||
dnl defines YACC with the appropriate command
|
dnl defines YACC with the appropriate command
|
||||||
AC_PROG_YACC
|
AC_PROG_YACC
|
||||||
|
Reference in New Issue
Block a user