Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow building wxWin with non-GNU make (which doesn't support -include)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-23 17:25:39 +00:00
parent 74ede4ebf0
commit 613d09959e
3 changed files with 500 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.in
View File

@@ -352,12 +352,12 @@ $(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_G
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
&& $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
parser.o: parser.c lexer.c parser.o: parser.c lexer.c
$(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c
parser.c: $(COMMDIR)/parser.y lexer.c parser.c: $(COMMDIR)/parser.y lexer.c
$(YACC) $(COMMDIR)/parser.y $(YACC) $(COMMDIR)/parser.y
@sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \ @sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \
sed -e "s/BUFSIZ/5000/g" | \ sed -e "s/BUFSIZ/5000/g" | \
@@ -367,7 +367,7 @@ parser.c: $(COMMDIR)/parser.y lexer.c
sed -e "s/unput/PROIO_unput/g" > parser.c sed -e "s/unput/PROIO_unput/g" > parser.c
@$(RM) y.tab.c @$(RM) y.tab.c
lexer.c: $(COMMDIR)/lexer.l lexer.c: $(COMMDIR)/lexer.l
$(LEX) $(COMMDIR)/lexer.l $(LEX) $(COMMDIR)/lexer.l
@sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \ @sed -e "s;$(COMMDIR)/@LEX_STEM@.c;lexer.l;g" < @LEX_STEM@.c | \
sed -e "s/yy/PROIO_yy/g" | \ sed -e "s/yy/PROIO_yy/g" | \
@@ -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@
@@ -419,7 +418,7 @@ preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAM
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
$(INSTALL) -d $(libdir)/wx $(INSTALL) -d $(libdir)/wx

924
configure vendored
View File

File diff suppressed because it is too large Load Diff

19
configure.in
View File

@@ -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