diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:36 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 20:47:36 +0200 |
| commit | 087b5a107c54045d44fe4f16374d552a6ae237c5 (patch) | |
| tree | 6db18f9ca694e641930cd58563cd6c5de49a93e0 /postprocess/packcomponents | |
| parent | 6ca81d4283601b2ba636dc7f96a88764cac42606 (diff) | |
| parent | 561ac3fea6612c49b83fd4b3a08031727ec0fa40 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
postprocess/prj/build.lst
Diffstat (limited to 'postprocess/packcomponents')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 0cef8d0037f9..0a439373ca83 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -102,6 +102,7 @@ my_components = \ component/unoxml/source/rdf/unordf \ component/unoxml/source/service/unoxml \ component/vbahelper/util/msforms \ + component/vcl/vcl \ component/writerfilter/util/writerfilter \ component/xmloff/source/transform/xof \ component/xmloff/util/xo \ @@ -177,7 +178,6 @@ my_components = \ updchk.uno \ uui \ vbaevents \ - vcl \ vclcanvas \ wpft \ wpgfilter \ @@ -196,7 +196,7 @@ my_components += pythonloader .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" my_components += splash .ENDIF - + .IF "$(BUILD_SPECIAL)" != "" my_components += oooimprovement .END |