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!
# =========================================================================
@@ -1446,7 +1446,7 @@ ifeq ($(OFFICIAL_BUILD),0)
VENDORTAG = _$(VENDOR)
endif
ifeq ($(OFFICIAL_BUILD),1)
VENDORTAG =
VENDORTAG =
endif
ifeq ($(BUILD),debug)
WXDEBUGFLAG = d
@@ -1476,10 +1476,10 @@ ifeq ($(USE_GUI),1)
__wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a
endif
ifeq ($(MONOLITHIC),0)
EXTRALIBS_FOR_BASE =
EXTRALIBS_FOR_BASE =
endif
ifeq ($(MONOLITHIC),1)
EXTRALIBS_FOR_BASE =
EXTRALIBS_FOR_BASE =
endif
ifeq ($(MONOLITHIC),1)
ifeq ($(SHARED),1)
@@ -4425,11 +4425,11 @@ endif
endif
ifeq ($(BUILD),release)
ifeq ($(DEBUG_INFO),default)
__DEBUGINFO =
__DEBUGINFO =
endif
endif
ifeq ($(DEBUG_INFO),0)
__DEBUGINFO =
__DEBUGINFO =
endif
ifeq ($(DEBUG_INFO),1)
__DEBUGINFO = -g
@@ -4441,7 +4441,7 @@ ifeq ($(BUILD),release)
__OPTIMIZEFLAG = -O2
endif
ifeq ($(USE_THREADS),0)
__THREADSFLAG =
__THREADSFLAG =
endif
ifeq ($(USE_THREADS),1)
__THREADSFLAG = -mthreads
@@ -4450,13 +4450,13 @@ ifeq ($(USE_RTTI),0)
__RTTIFLAG = -fno-rtti
endif
ifeq ($(USE_RTTI),1)
__RTTIFLAG =
__RTTIFLAG =
endif
ifeq ($(USE_EXCEPTIONS),0)
__EXCEPTIONSFLAG = -fno-exceptions
endif
ifeq ($(USE_EXCEPTIONS),1)
__EXCEPTIONSFLAG =
__EXCEPTIONSFLAG =
endif
ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -4501,7 +4501,7 @@ $(OBJS):
all: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__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)\*.o del $(OBJS)\*.o
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
@@ -5008,10 +5008,10 @@ wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP)
endif
endif
samples:
samples:
$(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all
$(LIBDIRNAME):
$(LIBDIRNAME):
if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME)
$(SETUPHDIR): $(LIBDIRNAME)
@@ -5020,10 +5020,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