[Libreoffice-commits] .: 3 commits - .gitignore postprocess/packcomponents postprocess/prj

[Norbert Thiebaud]

 .gitignore                             |    1 +
 postprocess/packcomponents/makefile.mk |    9 ++-------
 postprocess/prj/build.lst              |    2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

New commits:
commit 7a8589ec6ae6712487be97d84b0d29a2526e6867
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Apr 23 20:56:45 2011 -0500

    use tail_build to build 'late' gbuild enabled modules

diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 2079073..28486f0 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep CT2N:ct2n cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
commit 7dfca23a3a360cbdfc76a3abff57cfac5f0dd0ce
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Apr 23 20:54:40 2011 -0500

    ignore mac local build files

diff --git a/.gitignore b/.gitignore
index 4890e11..c95eec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,6 @@
 # the build directories
 /*/unxlng??
 /*/unxlng??.pro
+/*/unxmac??.pro
 /*/wntmsc???
 /*/wntmsc???.pro
commit 8e49f7537697981bd4f35071d6566343315cfeb5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Apr 23 20:52:35 2011 -0500

    starmath is built by gbuild now

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9e8966f..f8cdc75 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -38,12 +38,6 @@ 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 = \
     abp \
     analysis \
@@ -87,6 +81,8 @@ my_components = \
     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 \
@@ -158,7 +154,6 @@ my_components = \
     scriptframe \
     sdbc2 \
     simplecanvas \
-    $(SM_COMPONENTS)\
     solver \
     spell \
     spl \