From: Francesco M. <fr...@us...> - 2006-01-27 21:58:00
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: fixed top_builddir problems Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** makefile.vc 25 Jan 2006 18:35:58 -0000 1.11 --- makefile.vc 27 Jan 2006 21:57:09 -0000 1.12 *************** *** 70,87 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(USE_UTIL)" == "1" ! __utils___depname = sub_utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = sub_apps !endif --- 70,87 ---- ### Conditionally set variables: ### ! !if "$(USE_UTIL)" == "1" ! __utils___depname = sub_utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = sub_apps !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif *************** *** 93,97 **** ### Targets: ### ! all: $(__utils___depname) sub_modules $(__apps___depname) clean: --- 93,97 ---- ### Targets: ### ! all: ..\..\..\lib\vc_lib$(WXLIBPOSTFIX) ..\..\..\lib\vc_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) sub_modules $(__apps___depname) clean: *************** *** 99,115 **** -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch ! cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) !if "$(USE_UTIL)" == "1" sub_utils: ! cd ..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) --- 99,124 ---- -if exist msvc$(WXLIBPOSTFIX)\*.res del msvc$(WXLIBPOSTFIX)\*.res -if exist msvc$(WXLIBPOSTFIX)\*.pch del msvc$(WXLIBPOSTFIX)\*.pch ! cd ..\..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) ! cd ..\..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) clean cd $(MAKEDIR) + ..\..\..\lib\vc_lib$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\vc_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\vc_lib$(WXLIBPOSTFIX) + + ..\..\..\lib\vc_dll$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\vc_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\vc_dll$(WXLIBPOSTFIX) + + ..\..\..\bin: + if not exist ..\..\..\bin mkdir ..\..\..\bin + !if "$(USE_UTIL)" == "1" sub_utils: ! cd ..\..\..\util\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) *************** *** 117,121 **** sub_modules: ! cd ..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) --- 126,130 ---- sub_modules: ! cd ..\..\..\modules\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) *************** *** 123,129 **** !if "$(USE_APPS)" == "1" sub_apps: ! cd ..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) !endif --- 132,145 ---- !if "$(USE_APPS)" == "1" sub_apps: ! cd ..\..\..\apps\build\msw $(MAKE) -f makefile.vc $(MAKEARGS) cd $(MAKEDIR) !endif + docs: + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.bcc 25 Jan 2006 18:35:58 -0000 1.10 --- makefile.bcc 27 Jan 2006 21:57:09 -0000 1.11 *************** *** 142,159 **** ### Conditionally set variables: ### ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(USE_UTIL)" == "1" ! __utils___depname = utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = apps !endif --- 142,159 ---- ### Conditionally set variables: ### ! !if "$(USE_UTIL)" == "1" ! __utils___depname = utils !endif ! !if "$(USE_APPS)" == "1" ! __apps___depname = apps !endif !if "$(WX_DEBUG)" == "0" && "$(WX_UNICODE)" == "1" WXLIBPOSTFIX = u !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "0" ! WXLIBPOSTFIX = d !endif ! !if "$(WX_DEBUG)" == "1" && "$(WX_UNICODE)" == "1" ! WXLIBPOSTFIX = ud !endif *************** *** 165,169 **** ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: --- 165,169 ---- ### Targets: ### ! all: ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) modules $(__apps___depname) clean: *************** *** 171,190 **** -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! @echo cd ..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat @del borland$(WXLIBPOSTFIX)\utils.bat ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat @del borland$(WXLIBPOSTFIX)\modules.bat ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat @del borland$(WXLIBPOSTFIX)\apps.bat !if "$(USE_UTIL)" == "1" utils: ! @echo cd ..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat --- 171,199 ---- -if exist borland$(WXLIBPOSTFIX)\*.res del borland$(WXLIBPOSTFIX)\*.res -if exist borland$(WXLIBPOSTFIX)\*.csm del borland$(WXLIBPOSTFIX)\*.csm ! @echo cd ..\..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat @del borland$(WXLIBPOSTFIX)\utils.bat ! @echo cd ..\..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat @del borland$(WXLIBPOSTFIX)\modules.bat ! @echo cd ..\..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat @del borland$(WXLIBPOSTFIX)\apps.bat + ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\bcc_lib$(WXLIBPOSTFIX) + + ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX): + if not exist ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\bcc_dll$(WXLIBPOSTFIX) + + ..\..\..\bin: + if not exist ..\..\..\bin mkdir ..\..\..\bin + !if "$(USE_UTIL)" == "1" utils: ! @echo cd ..\..\..\util\build\msw >borland$(WXLIBPOSTFIX)\utils.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\utils.bat call borland$(WXLIBPOSTFIX)\utils.bat *************** *** 193,197 **** modules: ! @echo cd ..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat --- 202,206 ---- modules: ! @echo cd ..\..\..\modules\build\msw >borland$(WXLIBPOSTFIX)\modules.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\modules.bat call borland$(WXLIBPOSTFIX)\modules.bat *************** *** 200,204 **** !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat --- 209,213 ---- !if "$(USE_APPS)" == "1" apps: ! @echo cd ..\..\..\apps\build\msw >borland$(WXLIBPOSTFIX)\apps.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) >>borland$(WXLIBPOSTFIX)\apps.bat call borland$(WXLIBPOSTFIX)\apps.bat *************** *** 206,207 **** --- 215,223 ---- !endif + docs: + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.wat 25 Jan 2006 18:35:58 -0000 1.10 --- makefile.wat 27 Jan 2006 21:57:09 -0000 1.11 *************** *** 74,81 **** ### Conditionally set variables: ### WXLIBPOSTFIX = ! !ifeq WX_DEBUG 1 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif --- 74,89 ---- ### Conditionally set variables: ### + __utils___depname = + !ifeq USE_UTIL 1 + __utils___depname = utils + !endif + __apps___depname = + !ifeq USE_APPS 1 + __apps___depname = apps + !endif WXLIBPOSTFIX = ! !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u !endif !endif *************** *** 85,101 **** !endif !endif ! !ifeq WX_DEBUG 0 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = u !endif !endif - __utils___depname = - !ifeq USE_UTIL 1 - __utils___depname = utils - !endif - __apps___depname = - !ifeq USE_APPS 1 - __apps___depname = apps - !endif ### Variables: ### --- 93,101 ---- !endif !endif ! !ifeq WX_DEBUG 1 !ifeq WX_UNICODE 1 ! WXLIBPOSTFIX = ud !endif !endif ### Variables: ### *************** *** 117,121 **** ### Targets: ### ! all : .SYMBOLIC $(__utils___depname) modules $(__apps___depname) clean : .SYMBOLIC --- 117,121 ---- ### Targets: ### ! all : .SYMBOLIC ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) modules $(__apps___depname) clean : .SYMBOLIC *************** *** 125,141 **** -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch ! cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) !ifeq USE_UTIL 1 utils : .SYMBOLIC ! cd ..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) --- 125,150 ---- -if exist watcom$(WXLIBPOSTFIX)\*.ilk del watcom$(WXLIBPOSTFIX)\*.ilk -if exist watcom$(WXLIBPOSTFIX)\*.pch del watcom$(WXLIBPOSTFIX)\*.pch ! cd ..\..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) ! cd ..\..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) + ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) : + if not exist ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\wat_lib$(WXLIBPOSTFIX) + + ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) : + if not exist ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\wat_dll$(WXLIBPOSTFIX) + + ..\..\..\bin : + if not exist ..\..\..\bin mkdir ..\..\..\bin + !ifeq USE_UTIL 1 utils : .SYMBOLIC ! cd ..\..\..\util\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) *************** *** 143,147 **** modules : .SYMBOLIC ! cd ..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) --- 152,156 ---- modules : .SYMBOLIC ! cd ..\..\..\modules\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) *************** *** 149,155 **** !ifeq USE_APPS 1 apps : .SYMBOLIC ! cd ..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) !endif --- 158,171 ---- !ifeq USE_APPS 1 apps : .SYMBOLIC ! cd ..\..\..\apps\build\msw wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) cd $(WATCOM_CWD) !endif + docs : + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** makefile.gcc 25 Jan 2006 18:35:58 -0000 1.10 --- makefile.gcc 27 Jan 2006 21:57:09 -0000 1.11 *************** *** 66,72 **** ### Conditionally set variables: ### ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud endif endif --- 66,78 ---- ### Conditionally set variables: ### ! ifeq ($(USE_UTIL),1) ! __utils___depname = utils ! endif ! ifeq ($(USE_APPS),1) ! __apps___depname = apps ! endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u endif endif *************** *** 76,89 **** endif endif ! ifeq ($(WX_DEBUG),0) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = u ! endif ! endif ! ifeq ($(USE_UTIL),1) ! __utils___depname = utils endif - ifeq ($(USE_APPS),1) - __apps___depname = apps endif --- 82,89 ---- endif endif ! ifeq ($(WX_DEBUG),1) ifeq ($(WX_UNICODE),1) ! WXLIBPOSTFIX = ud endif endif *************** *** 95,120 **** ### Targets: ### ! all: $(__utils___depname) modules $(__apps___depname) clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d ! $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean ifeq ($(USE_UTIL),1) utils: ! $(MAKE) -C ..\..\util\build\msw -f makefile.gcc $(MAKEARGS) endif modules: ! $(MAKE) -C ..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) ifeq ($(USE_APPS),1) apps: ! $(MAKE) -C ..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) endif .PHONY: all clean utils modules apps --- 95,136 ---- ### Targets: ### ! all: ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX) ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX) ..\..\..\bin $(__utils___depname) modules $(__apps___depname) clean: -if exist mingw$(WXLIBPOSTFIX)\*.o del mingw$(WXLIBPOSTFIX)\*.o -if exist mingw$(WXLIBPOSTFIX)\*.d del mingw$(WXLIBPOSTFIX)\*.d ! $(MAKE) -C ..\..\..\util\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) clean ! $(MAKE) -C ..\..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) clean ! ! ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX): ! if not exist ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX) mkdir ..\..\..\lib\gcc_lib$(WXLIBPOSTFIX) ! ! ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX): ! if not exist ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX) mkdir ..\..\..\lib\gcc_dll$(WXLIBPOSTFIX) ! ! ..\..\..\bin: ! if not exist ..\..\..\bin mkdir ..\..\..\bin ifeq ($(USE_UTIL),1) utils: ! $(MAKE) -C ..\..\..\util\build\msw -f makefile.gcc $(MAKEARGS) endif modules: ! $(MAKE) -C ..\..\..\modules\build\msw -f makefile.gcc $(MAKEARGS) ifeq ($(USE_APPS),1) apps: ! $(MAKE) -C ..\..\..\apps\build\msw -f makefile.gcc $(MAKEARGS) endif + docs: + @echo ============================================= + @echo Creating wxLua documentation using doxygen... + @echo ============================================= + cd ../../..\docs + doxygen doxygen.cfg + .PHONY: all clean utils modules apps |