[Libreoffice-commits] .: 9 commits - .gitattributes sd/CppunitTest_sd_uimpress.mk sd/JunitTest_sd_unoapi.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sd/source slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:49:17 PDT 2011
.gitattributes | 1
sd/CppunitTest_sd_uimpress.mk | 3 -
sd/JunitTest_sd_unoapi.mk | 2
sd/Library_sd.mk | 123 ++++++++++++++++++++---------------------
sd/Library_sdfilt.mk | 6 --
sd/Library_sdui.mk | 25 ++++----
sd/source/ui/inc/fuediglu.hxx | 2
slideshow/Library_OGLTrans.mk | 6 --
slideshow/Library_slideshow.mk | 6 --
9 files changed, 83 insertions(+), 91 deletions(-)
New commits:
commit 4e1240e7afa91261578532eeca90e325b4231255
Merge: 0fb9e53... 576591c...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:22:59 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 0fb9e53c06265200b8836e60d9c748671126ca2b
Merge: ebcd1df... e8d28c5...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:38:59 2011 +0200
Merge branch 'master' into feature/gnumake4
diff --cc sd/CppunitTest_sd_uimpress.mk
index a348884,b8ee356..db7dda5
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@@ -32,10 -32,10 +32,9 @@@ $(eval $(call gb_CppunitTest_set_includ
-I$(realpath $(SRCDIR)/sd/inc) \
-I$(realpath $(SRCDIR)/sd/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
- $$(DEFS) \
+$(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
-DSD_DLLIMPLEMENTATION \
))
diff --cc sd/Library_sd.mk
index f4673ab,99f51e4..d0d4e1c
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@@ -44,10 -44,10 +44,9 @@@ $(eval $(call gb_Library_set_include,sd
-I$(WORKDIR)/inc/sd \
-I$(WORKDIR)/SdiTarget/sd/sdi \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sd,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sd,\
-DSD_DLLIMPLEMENTATION \
))
diff --cc sd/Library_sdfilt.mk
index 94563c6,97fe6b6..5076950
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@@ -34,10 -34,10 +34,9 @@@ $(eval $(call gb_Library_set_include,sd
-I$(realpath $(SRCDIR)/sd/inc) \
-I$(realpath $(SRCDIR)/sd/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sdfilt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sdfilt,\
-DSD_DLLIMPLEMENTATION \
))
diff --cc sd/Library_sdui.mk
index 012fad4,3b0b0aa..8d41825
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@@ -35,10 -35,10 +35,9 @@@ $(eval $(call gb_Library_set_include,sd
-I$(realpath $(SRCDIR)/sd/inc/pch) \
-I$(realpath $(SRCDIR)/sd/source/ui/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sdui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sdui,\
-DSD_DLLIMPLEMENTATION \
))
diff --cc slideshow/Library_slideshow.mk
index e5cce31,d5a1458..abbaa56
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@@ -34,10 -34,10 +34,9 @@@ $(eval $(call gb_Library_set_include,sl
-I$(realpath $(SRCDIR)/slideshow/inc/pch) \
-I$(realpath $(SRCDIR)/slideshow/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,slideshow,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
$(if $(filter TRUE,$(VERBOSE)),-DVERBOSE) \
))
commit ebcd1df9ff6e712ac67dbea480bdb0be03068835
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 15:13:01 2011 +0200
sd::FuEditGluePoints needs to be SD_DLLPUBLIC for sd::DrawViewShell
* fix attribute location
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index a036376..a299bb1 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -39,7 +39,7 @@ namespace sd {
|*
\************************************************************************/
-SD_DLLPUBLIC class FuEditGluePoints
+class SD_DLLPUBLIC FuEditGluePoints
: public FuDraw
{
public:
commit d7d079b676f6de091d7558226d0baeff026c64d6
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 15:12:15 2011 +0200
sd::FuEditGluePoints needs to be SD_DLLPUBLIC for sd::DrawViewShell
* fix attribute location
commit 2b1809f9829e67447260032a07f6c458c013d553
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 13:08:16 2011 +0200
sd::FuEditGluePoints needs to be SD_DLLPUBLIC for sd::DrawViewShell
diff --git a/sd/source/ui/inc/fuediglu.hxx b/sd/source/ui/inc/fuediglu.hxx
index 959a3f4..a036376 100644
--- a/sd/source/ui/inc/fuediglu.hxx
+++ b/sd/source/ui/inc/fuediglu.hxx
@@ -39,7 +39,7 @@ namespace sd {
|*
\************************************************************************/
-class FuEditGluePoints
+SD_DLLPUBLIC class FuEditGluePoints
: public FuDraw
{
public:
commit 89da320680393e2407034f041234f84bf192c181
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 12:22:49 2011 +0200
sort linked objects
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 900e760..f4673ab 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -91,20 +91,21 @@ $(eval $(call gb_Library_add_linked_libs,sd,\
$(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
$(eval $(call gb_Library_add_exception_objects,sd,\
+ sd/source/core/CustomAnimationCloner \
+ sd/source/core/CustomAnimationEffect \
+ sd/source/core/CustomAnimationPreset \
+ sd/source/core/EffectMigration \
+ sd/source/core/PageListWatcher \
+ sd/source/core/TransitionPreset \
sd/source/core/anminfo \
sd/source/core/annotations/Annotation \
sd/source/core/annotations/AnnotationEnumeration \
sd/source/core/cusshow \
- sd/source/core/CustomAnimationCloner \
- sd/source/core/CustomAnimationEffect \
- sd/source/core/CustomAnimationPreset \
sd/source/core/drawdoc \
sd/source/core/drawdoc2 \
sd/source/core/drawdoc3 \
sd/source/core/drawdoc4 \
sd/source/core/drawdoc_animations \
- sd/source/core/EffectMigration \
- sd/source/core/PageListWatcher \
sd/source/core/pglink \
sd/source/core/sdattr \
sd/source/core/sdiocmpt \
@@ -117,17 +118,16 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/core/stlpool \
sd/source/core/stlsheet \
sd/source/core/text/textapi \
- sd/source/core/TransitionPreset \
sd/source/core/typemap \
- sd/source/core/undoanim \
sd/source/core/undo/undofactory \
sd/source/core/undo/undomanager \
sd/source/core/undo/undoobjects \
+ sd/source/core/undoanim \
sd/source/filter/cgm/sdcgmfilter \
sd/source/filter/grf/sdgrffilter \
+ sd/source/filter/html/HtmlOptionsDialog \
sd/source/filter/html/buttonset \
sd/source/filter/html/htmlex \
- sd/source/filter/html/HtmlOptionsDialog \
sd/source/filter/html/sdhtmlfilter \
sd/source/filter/sdfilter \
sd/source/filter/sdpptwrp \
@@ -153,9 +153,9 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/animations/CustomAnimationList \
sd/source/ui/animations/CustomAnimationPane \
sd/source/ui/animations/DialogListBox \
- sd/source/ui/animations/motionpathtag \
- sd/source/ui/animations/SlideTransitionPane \
sd/source/ui/animations/STLPropertySet \
+ sd/source/ui/animations/SlideTransitionPane \
+ sd/source/ui/animations/motionpathtag \
sd/source/ui/annotations/annotationmanager \
sd/source/ui/annotations/annotationtag \
sd/source/ui/annotations/annotationwindow \
@@ -171,6 +171,15 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/app/tmplctrl \
sd/source/ui/controller/slidelayoutcontroller \
sd/source/ui/dlg/AnimationChildWindow \
+ sd/source/ui/dlg/LayerDialogChildWindow \
+ sd/source/ui/dlg/LayerDialogContent \
+ sd/source/ui/dlg/LayerTabBar \
+ sd/source/ui/dlg/NavigatorChildWindow \
+ sd/source/ui/dlg/PaneChildWindows \
+ sd/source/ui/dlg/PaneDockingWindow \
+ sd/source/ui/dlg/PaneShells \
+ sd/source/ui/dlg/SpellDialogChildWindow \
+ sd/source/ui/dlg/TemplateScanner \
sd/source/ui/dlg/animobjs \
sd/source/ui/dlg/assclass \
sd/source/ui/dlg/diactrl \
@@ -179,19 +188,10 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/dlg/filedlg \
sd/source/ui/dlg/gluectrl \
sd/source/ui/dlg/ins_paste \
- sd/source/ui/dlg/LayerDialogChildWindow \
- sd/source/ui/dlg/LayerDialogContent \
sd/source/ui/dlg/layeroptionsdlg \
- sd/source/ui/dlg/LayerTabBar \
- sd/source/ui/dlg/NavigatorChildWindow \
sd/source/ui/dlg/navigatr \
- sd/source/ui/dlg/PaneChildWindows \
- sd/source/ui/dlg/PaneDockingWindow \
- sd/source/ui/dlg/PaneShells \
sd/source/ui/dlg/sdabstdlg \
sd/source/ui/dlg/sdtreelb \
- sd/source/ui/dlg/SpellDialogChildWindow \
- sd/source/ui/dlg/TemplateScanner \
sd/source/ui/dlg/unchss \
sd/source/ui/docshell/docshel2 \
sd/source/ui/docshell/docshel3 \
@@ -300,10 +300,10 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/presenter/PresenterTextView \
sd/source/ui/presenter/SlideRenderer \
sd/source/ui/slideshow/PaneHider \
+ sd/source/ui/slideshow/SlideShowRestarter \
sd/source/ui/slideshow/showwin \
sd/source/ui/slideshow/slideshow \
sd/source/ui/slideshow/slideshowimpl \
- sd/source/ui/slideshow/SlideShowRestarter \
sd/source/ui/slideshow/slideshowviewimpl \
sd/source/ui/slidesorter/cache/SlsBitmapCache \
sd/source/ui/slidesorter/cache/SlsBitmapCompressor \
@@ -360,23 +360,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/table/tablefunction \
sd/source/ui/table/tableobjectbar \
sd/source/ui/toolpanel/ControlContainer \
- sd/source/ui/toolpanel/controls/AllMasterPagesSelector \
- sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector \
- sd/source/ui/toolpanel/controls/CustomAnimationPanel \
- sd/source/ui/toolpanel/controls/DocumentHelper \
- sd/source/ui/toolpanel/controls/MasterPageContainer \
- sd/source/ui/toolpanel/controls/MasterPageContainerFiller \
- sd/source/ui/toolpanel/controls/MasterPageContainerProviders \
- sd/source/ui/toolpanel/controls/MasterPageContainerQueue \
- sd/source/ui/toolpanel/controls/MasterPageDescriptor \
- sd/source/ui/toolpanel/controls/MasterPageObserver \
- sd/source/ui/toolpanel/controls/MasterPagesPanel \
- sd/source/ui/toolpanel/controls/MasterPagesSelector \
- sd/source/ui/toolpanel/controls/PreviewValueSet \
- sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages \
- sd/source/ui/toolpanel/controls/RecentMasterPagesSelector \
- sd/source/ui/toolpanel/controls/SlideTransitionPanel \
- sd/source/ui/toolpanel/controls/TableDesignPanel \
sd/source/ui/toolpanel/LayoutMenu \
sd/source/ui/toolpanel/ScrollPanel \
sd/source/ui/toolpanel/SlideSorterCacheDisplay \
@@ -393,6 +376,23 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/toolpanel/ToolPanelFactory \
sd/source/ui/toolpanel/ToolPanelUIElement \
sd/source/ui/toolpanel/ToolPanelViewShell \
+ sd/source/ui/toolpanel/controls/AllMasterPagesSelector \
+ sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector \
+ sd/source/ui/toolpanel/controls/CustomAnimationPanel \
+ sd/source/ui/toolpanel/controls/DocumentHelper \
+ sd/source/ui/toolpanel/controls/MasterPageContainer \
+ sd/source/ui/toolpanel/controls/MasterPageContainerFiller \
+ sd/source/ui/toolpanel/controls/MasterPageContainerProviders \
+ sd/source/ui/toolpanel/controls/MasterPageContainerQueue \
+ sd/source/ui/toolpanel/controls/MasterPageDescriptor \
+ sd/source/ui/toolpanel/controls/MasterPageObserver \
+ sd/source/ui/toolpanel/controls/MasterPagesPanel \
+ sd/source/ui/toolpanel/controls/MasterPagesSelector \
+ sd/source/ui/toolpanel/controls/PreviewValueSet \
+ sd/source/ui/toolpanel/controls/RecentMasterPagesSelector \
+ sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages \
+ sd/source/ui/toolpanel/controls/SlideTransitionPanel \
+ sd/source/ui/toolpanel/controls/TableDesignPanel \
sd/source/ui/tools/AsynchronousCall \
sd/source/ui/tools/ConfigurationAccess \
sd/source/ui/tools/EventMultiplexer \
@@ -404,14 +404,14 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/tools/SlotStateListener \
sd/source/ui/tools/TimerBasedTaskExecution \
sd/source/ui/unoidl/DrawController \
- sd/source/ui/unoidl/facreg \
- sd/source/ui/unoidl/randomnode \
sd/source/ui/unoidl/SdUnoDrawView \
sd/source/ui/unoidl/SdUnoOutlineView \
sd/source/ui/unoidl/SdUnoSlideView \
+ sd/source/ui/unoidl/UnoDocumentSettings \
+ sd/source/ui/unoidl/facreg \
+ sd/source/ui/unoidl/randomnode \
sd/source/ui/unoidl/unocpres \
sd/source/ui/unoidl/unodoc \
- sd/source/ui/unoidl/UnoDocumentSettings \
sd/source/ui/unoidl/unokywds \
sd/source/ui/unoidl/unolayer \
sd/source/ui/unoidl/unomodel \
@@ -421,8 +421,27 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/unoidl/unopback \
sd/source/ui/unoidl/unopool \
sd/source/ui/unoidl/unosrch \
- sd/source/ui/view/clview \
sd/source/ui/view/DocumentRenderer \
+ sd/source/ui/view/FormShellManager \
+ sd/source/ui/view/GraphicObjectBar \
+ sd/source/ui/view/GraphicViewShellBase \
+ sd/source/ui/view/ImpressViewShellBase \
+ sd/source/ui/view/MediaObjectBar \
+ sd/source/ui/view/OutlineViewShellBase \
+ sd/source/ui/view/Outliner \
+ sd/source/ui/view/OutlinerIterator \
+ sd/source/ui/view/PresentationViewShellBase \
+ sd/source/ui/view/SlideSorterViewShellBase \
+ sd/source/ui/view/ToolBarManager \
+ sd/source/ui/view/UpdateLockManager \
+ sd/source/ui/view/ViewClipboard \
+ sd/source/ui/view/ViewShellBase \
+ sd/source/ui/view/ViewShellHint \
+ sd/source/ui/view/ViewShellImplementation \
+ sd/source/ui/view/ViewShellManager \
+ sd/source/ui/view/ViewTabBar \
+ sd/source/ui/view/WindowUpdater \
+ sd/source/ui/view/clview \
sd/source/ui/view/drawview \
sd/source/ui/view/drbezob \
sd/source/ui/view/drtxtob \
@@ -447,20 +466,11 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/view/drviewsi \
sd/source/ui/view/drviewsj \
sd/source/ui/view/drvwshrg \
- sd/source/ui/view/FormShellManager \
sd/source/ui/view/frmview \
- sd/source/ui/view/GraphicObjectBar \
- sd/source/ui/view/GraphicViewShellBase \
sd/source/ui/view/grviewsh \
- sd/source/ui/view/ImpressViewShellBase \
- sd/source/ui/view/MediaObjectBar \
- sd/source/ui/view/Outliner \
- sd/source/ui/view/OutlinerIterator \
- sd/source/ui/view/OutlineViewShellBase \
sd/source/ui/view/outlnvs2 \
sd/source/ui/view/outlnvsh \
sd/source/ui/view/outlview \
- sd/source/ui/view/PresentationViewShellBase \
sd/source/ui/view/presvish \
sd/source/ui/view/sdruler \
sd/source/ui/view/sdview \
@@ -469,22 +479,12 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/view/sdview4 \
sd/source/ui/view/sdview5 \
sd/source/ui/view/sdwindow \
- sd/source/ui/view/SlideSorterViewShellBase \
sd/source/ui/view/tabcontr \
- sd/source/ui/view/ToolBarManager \
sd/source/ui/view/unmodpg \
- sd/source/ui/view/UpdateLockManager \
- sd/source/ui/view/ViewClipboard \
sd/source/ui/view/viewoverlaymanager \
sd/source/ui/view/viewshe2 \
sd/source/ui/view/viewshe3 \
sd/source/ui/view/viewshel \
- sd/source/ui/view/ViewShellBase \
- sd/source/ui/view/ViewShellHint \
- sd/source/ui/view/ViewShellImplementation \
- sd/source/ui/view/ViewShellManager \
- sd/source/ui/view/ViewTabBar \
- sd/source/ui/view/WindowUpdater \
sd/source/ui/view/zoomlist \
))
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index a46d95c..012fad4 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -66,8 +66,19 @@ $(eval $(call gb_Library_add_linked_libs,sdui,\
$(eval $(call gb_Library_add_exception_objects,sdui,\
sd/source/filter/html/htmlattr \
+ sd/source/filter/html/pubdlg \
sd/source/ui/dlg/brkdlg \
sd/source/ui/dlg/copydlg \
+ sd/source/ui/dlg/custsdlg \
+ sd/source/ui/dlg/dlgass \
+ sd/source/ui/dlg/dlgassim \
+ sd/source/ui/dlg/dlgchar \
+ sd/source/ui/dlg/dlgfield \
+ sd/source/ui/dlg/dlgolbul \
+ sd/source/ui/dlg/dlgpage \
+ sd/source/ui/dlg/dlgsnap \
+ sd/source/ui/dlg/headerfooterdlg \
+ sd/source/ui/dlg/inspagob \
sd/source/ui/dlg/masterlayoutdlg \
sd/source/ui/dlg/morphdlg \
sd/source/ui/dlg/paragr \
@@ -81,17 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,sdui,\
sd/source/ui/dlg/tpaction \
sd/source/ui/dlg/tpoption \
sd/source/ui/dlg/vectdlg \
- sd/source/ui/dlg/custsdlg \
- sd/source/ui/dlg/dlgass \
- sd/source/ui/dlg/dlgassim \
- sd/source/ui/dlg/dlgchar \
- sd/source/ui/dlg/dlgfield \
- sd/source/ui/dlg/dlgolbul \
- sd/source/ui/dlg/dlgpage \
- sd/source/ui/dlg/dlgsnap \
- sd/source/ui/dlg/headerfooterdlg \
- sd/source/ui/dlg/inspagob \
- sd/source/filter/html/pubdlg \
))
# $(WORKDIR)/inc/sd/sddll0.hxx :
commit 9c7db8b754c8525d1bc3d9d996d42048555bf323
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 13:17:18 2011 +0200
gnumake4: postmerge fixes in sd and slideshow
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 69db5c2..a348884 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
- $$(DEFS) \
+$(eval $(call gb_CppunitTest_add_defs,sd_uimpress,\
-DSD_DLLIMPLEMENTATION \
))
diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk
index 6afd01f..0d845d5 100644
--- a/sd/JunitTest_sd_unoapi.mk
+++ b/sd/JunitTest_sd_unoapi.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,sd_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,sd_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,sd_unoapi,\
$$(DEFS) \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a96e3b8..900e760 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -47,8 +47,7 @@ $(eval $(call gb_Library_set_include,sd,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sd,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sd,\
-DSD_DLLIMPLEMENTATION \
))
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index b1bb3de..94563c6 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -37,14 +37,12 @@ $(eval $(call gb_Library_set_include,sdfilt,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sdfilt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sdfilt,\
-DSD_DLLIMPLEMENTATION \
))
ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),)
-$(eval $(call gb_Library_set_defs,sdfilt,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sdfilt,\
-DDBG_ANIM_LOG \
))
endif
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index e74e965..a46d95c 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,sdui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sdui,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sdui,\
-DSD_DLLIMPLEMENTATION \
))
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 3a04c1e..3d59377 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -37,15 +37,13 @@ $(eval $(call gb_Library_set_include,OGLTrans,\
))
ifeq ($(strip $(VERBOSE)),TRUE)
-$(eval $(call gb_Library_set_defs,OGLTrans,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,OGLTrans,\
-DVERBOSE \
))
endif
ifneq ($(strip $(debug)$(DEBUG)),)
-$(eval $(call gb_Library_set_defs,OGLTrans,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,OGLTrans,\
-DBOOST_SP_ENABLE_DEBUG_HOOKS \
))
endif
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3823474..e5cce31 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -37,15 +37,13 @@ $(eval $(call gb_Library_set_include,slideshow,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,slideshow,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
$(if $(filter TRUE,$(VERBOSE)),-DVERBOSE) \
))
ifneq ($(strip $(debug)$(DEBUG)),)
-$(eval $(call gb_Library_set_defs,slideshow,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,slideshow,\
-DBOOST_SP_ENABLE_DEBUG_HOOKS \
))
endif
commit 199a69a3bab2153bde0e09ab3e286408e0a6a561
Merge: cdf12fc... 53f86bc...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 09:35:55 2011 +0200
Merge branch 'master' into feature/gnumake4
commit cdf12fc756a28acd2e0b7686a17af324ec093509
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jun 18 14:12:16 2011 +0200
fixing rebase errors
diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 0000000..f18402b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
More information about the Libreoffice-commits
mailing list