[Libreoffice-commits] .: 7 commits - Module_ooo.mk Repository.mk solenv/gbuild
David Tardon
dtardon at kemper.freedesktop.org
Thu Apr 21 12:02:15 PDT 2011
Module_ooo.mk | 4 ++++
Repository.mk | 9 +++++++++
solenv/gbuild/AllLangResTarget.mk | 1 +
solenv/gbuild/TargetLocations.mk | 7 ++++++-
solenv/gbuild/platform/macosx.mk | 4 ++++
solenv/gbuild/platform/solaris.mk | 2 ++
solenv/gbuild/platform/unxgcc.mk | 2 ++
7 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 6eea5b60c2efcf7ac6866410f5f3674bc7984302
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 21 20:14:17 2011 +0200
sd has some images in imagelst subdir...
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 09cd382..416032f 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -308,6 +308,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
+ -lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/imagelst) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
commit 5dabd84174a4af59311479218f38a62332bd2064
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 21 19:21:09 2011 +0200
add pck to the delivery dirs
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index fde3049..dc04ba7 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -31,6 +31,7 @@ gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
gb_PackagePart_get_destinations = \
$(OUTDIR)/xml \
+ $(OUTDIR)/pck \
$(OUTDIR)/inc \
$(OUTDIR)/bin \
commit a2604c37ea772a27623a902592c503b958ec427d
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 21 19:20:15 2011 +0200
list one target per line
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 185261c..fde3049 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -29,7 +29,11 @@
gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
-gb_PackagePart_get_destinations = $(OUTDIR)/xml $(OUTDIR)/inc $(OUTDIR)/bin
+gb_PackagePart_get_destinations = \
+ $(OUTDIR)/xml \
+ $(OUTDIR)/inc \
+ $(OUTDIR)/bin \
+
gb_PackagePart_get_target = $(OUTDIR)/$(1)
gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
commit 33258658165e8488fb4eecb92d96f580f0d047a9
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 14:50:07 2011 +0200
gbuildize reportdesign
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 2a2e344..bc566ac 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
lotuswordpro \
oox \
padmin \
+ reportbuilder \
sc \
sd \
sfx2 \
diff --git a/Repository.mk b/Repository.mk
index d208940..ee13ef3 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -77,6 +77,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
ooxml \
qstart_gtk \
resourcemodel \
+ rpt \
+ rptui \
+ rptxml \
sax \
sb \
sc \
commit 7c4863df2bd4f67b873ad7ee8fbae75d01a2e4d5
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 12:26:42 2011 +0200
gbuildize formula
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 5daceef..2a2e344 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
editeng \
fileaccess \
forms \
+ formula \
framework \
lotuswordpro \
oox \
commit d8353066031706f482f3a645dc44a4434aa8b121
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 10:35:23 2011 +0200
gbuildize slideshow
diff --git a/Module_ooo.mk b/Module_ooo.mk
index d5666bd..5daceef 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
sc \
sd \
sfx2 \
+ slideshow \
sot \
svl \
svtools \
diff --git a/Repository.mk b/Repository.mk
index d49cec1..d208940 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -149,8 +149,10 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
hatchwindowfactory \
lomenubar \
msforms \
+ OGLTrans \
passwordcontainer \
productregistration \
+ slideshow \
vbaobj \
vbaswobj \
writerfilter_uno \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2def0c9..23f41b6 100755
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -319,10 +319,14 @@ endif
gb_Library__FRAMEWORKS := \
Cocoa \
+ GLUT \
+ OpenGL \
gb_Library_PLAINLIBS_NONE += \
+ GLUT \
Cocoa \
objc \
+ OpenGL \
jpeg \
m \
pthread \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 9095d60..591c100 100755
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -246,6 +246,8 @@ endif
gb_Library_PLAINLIBS_NONE += \
dl \
+ GL \
+ GLU \
jpeg \
m \
pthread \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 4ab5d36..c17805f 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -298,6 +298,8 @@ gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
gb_Library_PLAINLIBS_NONE += \
dl \
+ GL \
+ GLU \
jpeg \
m \
pthread \
commit 6e2d10af4de14fd72714ab4e232bdc57d6f29a4d
Author: David Tardon <dtardon at redhat.com>
Date: Wed Apr 20 08:59:22 2011 +0200
gbuildize sd
diff --git a/Module_ooo.mk b/Module_ooo.mk
index bdcd833..d5666bd 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
oox \
padmin \
sc \
+ sd \
sfx2 \
sot \
svl \
diff --git a/Repository.mk b/Repository.mk
index cd74bf1..d49cec1 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -83,7 +83,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
scd \
scfilt \
scui \
+ sd \
sdbt \
+ sdd \
+ sdfilt \
+ sdui \
sfx \
sm \
smd \
More information about the Libreoffice-commits
mailing list