[Libreoffice-commits] .: postprocess/packcomponents

[Norbert Thiebaud]

 postprocess/packcomponents/makefile.mk |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

New commits:
commit 8a9e1f669f78314022b31918de1dc497e6485827
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 26 15:24:42 2011 -0500

    gbuild deliver the component files at different place than old build
    
    in order to support gbuild.lst target in // with build.lst
    we need a bit of define-foo here to point to the correct
    location of the .component xml registration files
    
    this should be removed when the modules are definitively migrated to
    gnumake (i.e when the old build.lst is removed and replaced by gbuild.lst)

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 0136aa8..dfdfd7c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -38,6 +38,14 @@ 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"
+SC_COMPONENTS:=sc scd
+SM_COMPONENTS:=sm smd vbaobj
+.ELSE
+SC_COMPONENTS:= component/sc/util/sc component/sc/util/scd component/sc/util/vbaobj
+SM_COMPONENTS:= component/starmath/util/sm component/starmath/util/smd
+.END
+
 my_components = \
     abp \
     adabasui \
@@ -136,8 +144,7 @@ my_components = \
     rptxml \
     sax \
     sb \
-    sc \
-    scd \
+    $(SC_COMPONENTS)\
     scn \
     scriptframe \
     sd \
@@ -146,8 +153,7 @@ my_components = \
     sdd \
     simplecanvas \
     slideshow \
-    sm \
-    smd \
+    $(SM_COMPONENTS)\
     solver \
     spell \
     spl \
@@ -171,7 +177,6 @@ my_components = \
     updchk.uno \
     utl \
     uui \
-    vbaobj \
     vbaevents \
     vcl \
     vclcanvas \