[Libreoffice-commits] .: Branch 'integration/dev300_m106' - 2 commits - .gitignore Repository.mk solenv/gbuild

[Jan Holesovsky]

 .gitignore                       |    8 ++++++++
 Repository.mk                    |    3 ++-
 solenv/gbuild/platform/unxgcc.mk |    4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit d4e0d177170b2bee4cb6ddaf6670c1f7f6118eb4
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 29 19:23:22 2011 +0200

    Update .gitignore with the new modules.

diff --git a/.gitignore b/.gitignore
index 9dff7ee..990b37a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,6 +122,9 @@
 /formula
 /fpicker
 /framework
+/gdk-pixbuf
+/gettext
+/glib
 /graphite
 /helpcontent2
 /hsqldb
@@ -145,7 +148,11 @@
 /l10n
 /l10ntools
 /languagetool
+/libcroco
 /libegg
+/libgsf
+/libpng
+/librsvg
 /libtextcat
 /libwpd
 /libwpg
@@ -181,6 +188,7 @@
 /package
 /packimages
 /padmin
+/pango
 /postprocess
 /psprint_config
 /python
commit 41f2c7adead04881fbdd2b2e505c43cd3d79a92d
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Apr 29 19:14:29 2011 +0200

    Updates to make vcl building.

diff --git a/Repository.mk b/Repository.mk
index 584e63a..279250c 100755
--- a/Repository.mk
+++ b/Repository.mk
@@ -148,11 +148,12 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
 ))
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+    graphite2_off \
     jpeglib \
     ooopathutils \
     salcpprt \
+    vclmain \
     zlib \
-    graphite \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d3b63ed..7dd7715 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -278,10 +278,14 @@ gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
 
 gb_Library_PLAINLIBS_NONE += \
 	dl \
+	freetype \
+	ICE \
 	jpeg \
 	m \
 	pthread \
+	SM \
 	X11 \
+	Xext \
 	z
 
 gb_Library_FILENAMES := \