Rebake everything using bakefile 0.2.7.

Also updated aclocal inputs and regenerated configure.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-10-22 16:53:10 +00:00
parent 124a5e3e6a
commit 7880889720
1161 changed files with 124960 additions and 119042 deletions

View File

@@ -1,6 +1,6 @@
# =========================================================================
# This makefile was generated by
# Bakefile 0.2.6 (http://www.bakefile.org)
# Bakefile 0.2.7 (http://www.bakefile.org)
# Do not modify, all changes will be overwritten!
# =========================================================================
@@ -1430,7 +1430,7 @@ PORTNAME = msw
VENDORTAG = _$(VENDOR)
!endif
!if "$(OFFICIAL_BUILD)" == "1"
VENDORTAG =
VENDORTAG =
!endif
!if "$(BUILD)" == "debug"
WXDEBUGFLAG = d
@@ -1460,10 +1460,10 @@ __wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib
!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
EXTRALIBS_FOR_BASE =
!endif
!if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE =
EXTRALIBS_FOR_BASE =
!endif
!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1"
__monodll___depname = \
@@ -4209,7 +4209,7 @@ __htmldll_library_link_LIBR = \
$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib
!endif
!if "$(USE_THREADS)" == "0"
__THREADSFLAG_13 =
__THREADSFLAG_13 =
!endif
!if "$(USE_THREADS)" == "1"
__THREADSFLAG_13 = mt
@@ -4218,7 +4218,7 @@ __THREADSFLAG_13 = mt
__RUNTIME_LIBS_5 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_5 =
__RUNTIME_LIBS_5 =
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_62 = -d__WXUNIVERSAL__
@@ -4281,7 +4281,7 @@ __OPTIMIZEFLAG = -Od
__OPTIMIZEFLAG = -O2
!endif
!if "$(USE_THREADS)" == "0"
__THREADSFLAG =
__THREADSFLAG =
!endif
!if "$(USE_THREADS)" == "1"
__THREADSFLAG = -tWM
@@ -4290,7 +4290,7 @@ __THREADSFLAG = -tWM
__RUNTIME_LIBS = -tWR
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS =
__RUNTIME_LIBS =
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -4335,7 +4335,7 @@ $(OBJS):
all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file
clean:
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
@@ -4847,13 +4847,13 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
!endif
samples:
samples:
@echo cd ..\..\samples >$(OBJS)\samples.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>$(OBJS)\samples.bat
call $(OBJS)\samples.bat
@del $(OBJS)\samples.bat
$(LIBDIRNAME):
$(LIBDIRNAME):
if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
$(SETUPHDIR): $(LIBDIRNAME)
@@ -4862,10 +4862,10 @@ $(SETUPHDIR): $(LIBDIRNAME)
$(SETUPHDIR)\wx: $(SETUPHDIR)
if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx
..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h:
..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h:
if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h
$(SETUPHDIR)\wx\setup.h:
$(SETUPHDIR)\wx\setup.h:
if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h
$(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx