Hi David, Your recent commit which removed solenv/inc/sc.mk and solenv/inc/scpre.mk in bootstrap.git breaks the build of sc here. Given that the change is in makefile.mk files, tinderbox won't notice it, I assume. ;) I'm attaching a patch that fixes the problem for me. OK to push? Thanks, Miklos
From cd178802357fe77499c81e6f20fb6f367ee24625 Mon Sep 17 00:00:00 2001 From: Miklos Vajna <vmiklos@frugalware.org> Date: Sun, 17 Oct 2010 21:44:19 +0200 Subject: [PATCH] sc: no longer include non-existing scpre.mk and sc.mk They were empty anyway so just including them fixes the problem. @@ -31,9 +31,7 @@ TARGET=view # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- --- sc/source/core/data/makefile.mk | 2 -- sc/source/core/src/makefile.mk | 2 -- sc/source/core/tool/makefile.mk | 2 -- sc/source/filter/dif/makefile.mk | 2 -- sc/source/filter/excel/makefile.mk | 2 -- sc/source/filter/ftools/makefile.mk | 2 -- sc/source/filter/html/makefile.mk | 2 -- sc/source/filter/lotus/makefile.mk | 2 -- sc/source/filter/qpro/makefile.mk | 2 -- sc/source/filter/rtf/makefile.mk | 2 -- sc/source/filter/starcalc/makefile.mk | 2 -- sc/source/filter/xcl97/makefile.mk | 2 -- sc/source/filter/xml/makefile.mk | 2 -- sc/source/ui/Accessibility/makefile.mk | 2 -- sc/source/ui/app/makefile.mk | 2 -- sc/source/ui/attrdlg/makefile.mk | 2 -- sc/source/ui/cctrl/makefile.mk | 2 -- sc/source/ui/dbgui/makefile.mk | 2 -- sc/source/ui/docshell/makefile.mk | 2 -- sc/source/ui/drawfunc/makefile.mk | 2 -- sc/source/ui/formdlg/makefile.mk | 2 -- sc/source/ui/miscdlgs/makefile.mk | 2 -- sc/source/ui/namedlg/makefile.mk | 2 -- sc/source/ui/navipi/makefile.mk | 2 -- sc/source/ui/optdlg/makefile.mk | 2 -- sc/source/ui/pagedlg/makefile.mk | 2 -- sc/source/ui/src/makefile.mk | 2 -- sc/source/ui/styleui/makefile.mk | 2 -- sc/source/ui/undo/makefile.mk | 2 -- sc/source/ui/unoobj/makefile.mk | 2 -- sc/source/ui/view/makefile.mk | 2 -- 31 files changed, 0 insertions(+), 62 deletions(-) diff --git a/sc/source/core/data/makefile.mk b/sc/source/core/data/makefile.mk index 9041e1c..f3b3a35 100644 --- a/sc/source/core/data/makefile.mk +++ b/sc/source/core/data/makefile.mk @@ -38,9 +38,7 @@ AUTOSEG=true # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/core/src/makefile.mk b/sc/source/core/src/makefile.mk index 13d0c21..10da798 100644 --- a/sc/source/core/src/makefile.mk +++ b/sc/source/core/src/makefile.mk @@ -33,9 +33,7 @@ TARGET=core # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/core/tool/makefile.mk b/sc/source/core/tool/makefile.mk index 9819cf2..b1cad58 100644 --- a/sc/source/core/tool/makefile.mk +++ b/sc/source/core/tool/makefile.mk @@ -38,9 +38,7 @@ AUTOSEG=true # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/dif/makefile.mk b/sc/source/filter/dif/makefile.mk index c24de4c..70944b9 100644 --- a/sc/source/filter/dif/makefile.mk +++ b/sc/source/filter/dif/makefile.mk @@ -38,9 +38,7 @@ PROJECTPCHSOURCE=..\pch\filt_pch # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/excel/makefile.mk b/sc/source/filter/excel/makefile.mk index d5b90ab..c961873 100644 --- a/sc/source/filter/excel/makefile.mk +++ b/sc/source/filter/excel/makefile.mk @@ -40,9 +40,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/ftools/makefile.mk b/sc/source/filter/ftools/makefile.mk index 27a960e..d37e74a 100644 --- a/sc/source/filter/ftools/makefile.mk +++ b/sc/source/filter/ftools/makefile.mk @@ -38,9 +38,7 @@ PROJECTPCHSOURCE=..\pch\filt_pch # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/html/makefile.mk b/sc/source/filter/html/makefile.mk index 93e992c..41db4de 100644 --- a/sc/source/filter/html/makefile.mk +++ b/sc/source/filter/html/makefile.mk @@ -40,9 +40,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/lotus/makefile.mk b/sc/source/filter/lotus/makefile.mk index 8fb2360..e4d18f8 100644 --- a/sc/source/filter/lotus/makefile.mk +++ b/sc/source/filter/lotus/makefile.mk @@ -40,9 +40,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/qpro/makefile.mk b/sc/source/filter/qpro/makefile.mk index fa8b018..7406f05 100644 --- a/sc/source/filter/qpro/makefile.mk +++ b/sc/source/filter/qpro/makefile.mk @@ -39,9 +39,7 @@ AUTOSEG=true # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/rtf/makefile.mk b/sc/source/filter/rtf/makefile.mk index a680751..651309f 100644 --- a/sc/source/filter/rtf/makefile.mk +++ b/sc/source/filter/rtf/makefile.mk @@ -40,9 +40,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/starcalc/makefile.mk b/sc/source/filter/starcalc/makefile.mk index 836f6b0..157059d 100644 --- a/sc/source/filter/starcalc/makefile.mk +++ b/sc/source/filter/starcalc/makefile.mk @@ -40,9 +40,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/xcl97/makefile.mk b/sc/source/filter/xcl97/makefile.mk index 3ce71ba..04a028e 100644 --- a/sc/source/filter/xcl97/makefile.mk +++ b/sc/source/filter/xcl97/makefile.mk @@ -40,9 +40,7 @@ VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/filter/xml/makefile.mk b/sc/source/filter/xml/makefile.mk index 7f9f2d5..47d4281 100644 --- a/sc/source/filter/xml/makefile.mk +++ b/sc/source/filter/xml/makefile.mk @@ -40,9 +40,7 @@ PROJECTPCHSOURCE=..\pch\filt_pch # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/Accessibility/makefile.mk b/sc/source/ui/Accessibility/makefile.mk index 32df957..f041ca0 100644 --- a/sc/source/ui/Accessibility/makefile.mk +++ b/sc/source/ui/Accessibility/makefile.mk @@ -32,9 +32,7 @@ TARGET=accessibility # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/app/makefile.mk b/sc/source/ui/app/makefile.mk index a7ff3fe..9d487ba 100644 --- a/sc/source/ui/app/makefile.mk +++ b/sc/source/ui/app/makefile.mk @@ -32,9 +32,7 @@ TARGET=app # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/attrdlg/makefile.mk b/sc/source/ui/attrdlg/makefile.mk index 378fd10..9b4dc49 100644 --- a/sc/source/ui/attrdlg/makefile.mk +++ b/sc/source/ui/attrdlg/makefile.mk @@ -33,9 +33,7 @@ LIBTARGET=no # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/cctrl/makefile.mk b/sc/source/ui/cctrl/makefile.mk index 531013e..70b5490 100644 --- a/sc/source/ui/cctrl/makefile.mk +++ b/sc/source/ui/cctrl/makefile.mk @@ -33,9 +33,7 @@ LIBTARGET=NO # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/dbgui/makefile.mk b/sc/source/ui/dbgui/makefile.mk index 1e7000d..ab632bf 100644 --- a/sc/source/ui/dbgui/makefile.mk +++ b/sc/source/ui/dbgui/makefile.mk @@ -33,9 +33,7 @@ LIBTARGET=no # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/docshell/makefile.mk b/sc/source/ui/docshell/makefile.mk index df8d4c9..6776a0b 100644 --- a/sc/source/ui/docshell/makefile.mk +++ b/sc/source/ui/docshell/makefile.mk @@ -33,9 +33,7 @@ LIBTARGET=no # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/drawfunc/makefile.mk b/sc/source/ui/drawfunc/makefile.mk index f82008e..cf69944 100644 --- a/sc/source/ui/drawfunc/makefile.mk +++ b/sc/source/ui/drawfunc/makefile.mk @@ -32,9 +32,7 @@ TARGET=drawfunc # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/formdlg/makefile.mk b/sc/source/ui/formdlg/makefile.mk index 339e8fa..2574ca4 100644 --- a/sc/source/ui/formdlg/makefile.mk +++ b/sc/source/ui/formdlg/makefile.mk @@ -32,9 +32,7 @@ TARGET=formdlgs # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/miscdlgs/makefile.mk b/sc/source/ui/miscdlgs/makefile.mk index d3c6853..115fc3a 100644 --- a/sc/source/ui/miscdlgs/makefile.mk +++ b/sc/source/ui/miscdlgs/makefile.mk @@ -33,9 +33,7 @@ LIBTARGET=no # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/namedlg/makefile.mk b/sc/source/ui/namedlg/makefile.mk index 7c1151b..7bc7b26 100644 --- a/sc/source/ui/namedlg/makefile.mk +++ b/sc/source/ui/namedlg/makefile.mk @@ -32,9 +32,7 @@ TARGET=namedlg # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/navipi/makefile.mk b/sc/source/ui/navipi/makefile.mk index 9c0de07..992aefc 100644 --- a/sc/source/ui/navipi/makefile.mk +++ b/sc/source/ui/navipi/makefile.mk @@ -32,9 +32,7 @@ TARGET=navipi # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/optdlg/makefile.mk b/sc/source/ui/optdlg/makefile.mk index 437d57d..9c816f5 100644 --- a/sc/source/ui/optdlg/makefile.mk +++ b/sc/source/ui/optdlg/makefile.mk @@ -32,9 +32,7 @@ TARGET=optdlg # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/pagedlg/makefile.mk b/sc/source/ui/pagedlg/makefile.mk index 500e642..93224ec 100644 --- a/sc/source/ui/pagedlg/makefile.mk +++ b/sc/source/ui/pagedlg/makefile.mk @@ -33,9 +33,7 @@ LIBTARGET=no # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/src/makefile.mk b/sc/source/ui/src/makefile.mk index 7036ad8..e1974ed 100644 --- a/sc/source/ui/src/makefile.mk +++ b/sc/source/ui/src/makefile.mk @@ -33,9 +33,7 @@ TARGET=ui # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/styleui/makefile.mk b/sc/source/ui/styleui/makefile.mk index 9361033..ccbd2e1 100644 --- a/sc/source/ui/styleui/makefile.mk +++ b/sc/source/ui/styleui/makefile.mk @@ -32,9 +32,7 @@ TARGET=styleui # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/undo/makefile.mk b/sc/source/ui/undo/makefile.mk index 50fab82..2b8dd60 100644 --- a/sc/source/ui/undo/makefile.mk +++ b/sc/source/ui/undo/makefile.mk @@ -32,9 +32,7 @@ TARGET=undo # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/unoobj/makefile.mk b/sc/source/ui/unoobj/makefile.mk index 36c3493..45b1163 100644 --- a/sc/source/ui/unoobj/makefile.mk +++ b/sc/source/ui/unoobj/makefile.mk @@ -35,9 +35,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- diff --git a/sc/source/ui/view/makefile.mk b/sc/source/ui/view/makefile.mk index f7be2b3..3b1d570 100644 --- a/sc/source/ui/view/makefile.mk +++ b/sc/source/ui/view/makefile.mk @@ -31,9 +31,7 @@ TARGET=view # --- Settings ----------------------------------------------------- -.INCLUDE : scpre.mk .INCLUDE : settings.mk -.INCLUDE : sc.mk .INCLUDE : $(PRJ)$/util$/makefile.pmk # --- Files -------------------------------------------------------- -- 1.7.3.1
Attachment:
pgpRPvFSXICSS.pgp
Description: PGP signature