diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-04-28 01:51:13 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-04-28 01:51:13 +0200 |
| commit | 6bd810b63a2739f77db2556e78957e5e37634e0a (patch) | |
| tree | de9e9f625481e9203e7a5a7f1abe78fb6ea34232 /postprocess | |
| parent | 2bd14bbf2e8e9bb9f3a783450875a736219901c2 (diff) | |
Revert "add gbuild component files from dbaccess"
This reverts commit d93cc6749507b6c33307a77ba9939145d8008dca.
(botched rebase of feature branch)
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index f44a5f2bdb28..961f24bb5a12 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -38,14 +38,7 @@ PKGCONFIG_MODULES=gtk+-2.0 GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES) .END -.IF "$(USE_GMAKE)" != "1" -SM_COMPONENTS:=sm smd -.ELSE -SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd -.END - my_components = \ - $(SM_COMPONENTS)\ abp \ analysis \ animcore \ @@ -69,17 +62,27 @@ my_components = \ component/dbaccess/util/sdbt \ component/fileaccess/source/fileacc \ component/forms/util/frm \ + component/formula/util/for \ component/framework/util/fwk \ component/framework/util/fwl \ component/framework/util/fwm \ component/lotuswordpro/util/lwpfilter \ component/oox/util/oox \ + component/reportdesign/util/rpt \ + component/reportdesign/util/rptui \ + component/reportdesign/util/rptxml \ component/sc/util/sc \ component/sc/util/scd \ component/sc/util/scfilt \ component/sc/util/vbaobj \ + component/sd/util/sd \ + component/sd/util/sdd \ + component/sd/util/sdfilt \ component/sfx2/util/sfx \ + component/slideshow/util/slideshow \ component/sot/util/sot \ + component/starmath/util/sm \ + component/starmath/util/smd \ component/svl/source/fsstor/fsstorage \ component/svl/source/passwordcontainer/passwordcontainer \ component/svl/util/svl \ @@ -117,7 +120,6 @@ my_components = \ filterconfig1 \ flash \ flat \ - for \ fpicker \ fps_office \ guesslang \ @@ -144,21 +146,13 @@ my_components = \ placeware \ preload \ protocolhandler \ - pythonloader \ res \ sax \ sb \ scn \ scriptframe \ - sd \ sdbc2 \ -<<<<<<< HEAD simplecanvas \ -======= - sdd \ - simplecanvas \ - slideshow \ ->>>>>>> add gbuild component files from dbaccess solver \ spell \ spl \ @@ -194,6 +188,10 @@ my_components = \ xsltfilter \ xstor +.IF "$(DISABLE_PYTHON)" != "TRUE" +my_components += pythonloader +.ENDIF + .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" my_components += splash .ENDIF @@ -239,7 +237,7 @@ my_components += kde4be1 .END .IF "$(ENABLE_OGL)" == "TRUE" -my_components += ogltrans +my_components += component/slideshow/source/engine/OGLTrans/ogltrans .END .IF "$(ENABLE_SVCTAGS)" == "YES" |