[Libreoffice-commits] .: 3 commits - animations/prj sd/CppunitTest_sd_uimpress.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sd/util slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk slideshow/prj
David Tardon
dtardon at kemper.freedesktop.org
Sat Jun 18 02:33:41 PDT 2011
animations/prj/build.lst | 2 +-
sd/CppunitTest_sd_uimpress.mk | 6 +++++-
sd/Library_sd.mk | 6 +++++-
sd/Library_sdd.mk | 6 +++++-
sd/Library_sdfilt.mk | 6 +++++-
sd/Library_sdui.mk | 6 +++++-
sd/util/makefile.pmk | 32 --------------------------------
slideshow/CppunitTest_slideshow.mk | 6 +++++-
slideshow/Executable_demoshow.mk | 6 +++++-
slideshow/Library_OGLTrans.mk | 6 +++++-
slideshow/Library_slideshow.mk | 6 +++++-
slideshow/prj/build.lst | 2 +-
12 files changed, 47 insertions(+), 43 deletions(-)
New commits:
commit 6db16bc305cef1eababeb2a44adb2f60366a6aad
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 30 18:55:43 2011 +0200
remove stray makefile
diff --git a/sd/util/makefile.pmk b/sd/util/makefile.pmk
deleted file mode 100644
index 0ae6fe6..0000000
--- a/sd/util/makefile.pmk
+++ /dev/null
@@ -1,32 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-INCPRE+=$(SOLARINCDIR)$/offuh
-
-# define SD_DLLIMPLEMENTATION (see @ sddllapi.h)
-CDEFS += -DSD_DLLIMPLEMENTATION
-
-VISIBILITY_HIDDEN=TRUE
commit 7551d219c77d1511884d8d81f7778d5fae288b49
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 30 18:47:55 2011 +0200
remove all traces of offuh from makefiles
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 69db5c2..79ebbb4 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
-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,\
@@ -40,6 +39,11 @@ $(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
-DSD_DLLIMPLEMENTATION \
))
+$(eval $(call gb_CppunitTest_add_api,sd_uimpress,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_CppunitTest_add_library_objects,sd_uimpress,sd))
$(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a96e3b8..99f51e4 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -44,7 +44,6 @@ $(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,\
@@ -59,6 +58,11 @@ $(eval $(call gb_Library_set_defs,sd,\
))
endif
+$(eval $(call gb_Library_add_api,sd,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,sd,\
avmedia \
basegfx \
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 894e399..61ae7d3 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,sdd,\
-I$(realpath $(SRCDIR)/sd/inc) \
-I$(realpath $(SRCDIR)/sd/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,sdd,\
+ offapi \
+ udkapi \
))
$(eval $(call gb_Library_add_linked_libs,sdd,\
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index b1bb3de..97fe6b6 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,sdfilt,\
-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,\
@@ -49,6 +48,11 @@ $(eval $(call gb_Library_set_defs,sdfilt,\
))
endif
+$(eval $(call gb_Library_add_api,sdfilt,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,sdfilt,\
comphelper \
cppu \
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index e74e965..3b0b0aa 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,sdui,\
-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,\
@@ -43,6 +42,11 @@ $(eval $(call gb_Library_set_defs,sdui,\
-DSD_DLLIMPLEMENTATION \
))
+$(eval $(call gb_Library_add_api,sdui,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,sdui,\
basegfx \
comphelper \
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index 3105f90..3967524 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_CppunitTest_set_include,slideshow,\
-I$(realpath $(SRCDIR)/slideshow/inc/pch) \
-I$(realpath $(SRCDIR)/slideshow/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_CppunitTest_set_defs,slideshow,\
@@ -49,6 +48,11 @@ $(eval $(call gb_CppunitTest_set_defs,slideshow,\
))
endif
+$(eval $(call gb_CppunitTest_add_api,slideshow,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_CppunitTest_add_library_objects,slideshow,slideshow))
$(eval $(call gb_CppunitTest_add_linked_libs,slideshow,\
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index 6c54ff5..a50d79a 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Executable_set_include,demoshow,\
-I$(realpath $(SRCDIR)/slideshow/inc/pch) \
-I$(realpath $(SRCDIR)/slideshow/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
ifeq ($(strip $(VERBOSE)),TRUE)
@@ -51,6 +50,11 @@ $(eval $(call gb_Executable_set_defs,demoshow,\
))
endif
+$(eval $(call gb_Library_add_api,demoshow,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Executable_add_linked_libs,demoshow,\
basegfx \
comphelper \
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 3a04c1e..eb34b01 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,OGLTrans,\
$$(INCLUDE) \
-I$(realpath $(SRCDIR)/slideshow/inc/pch) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
ifeq ($(strip $(VERBOSE)),TRUE)
@@ -50,6 +49,11 @@ $(eval $(call gb_Library_set_defs,OGLTrans,\
))
endif
+$(eval $(call gb_Library_add_api,OGLTrans,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,OGLTrans,\
canvastools \
comphelper \
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 3823474..d5a1458 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_set_include,slideshow,\
-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,\
@@ -50,6 +49,11 @@ $(eval $(call gb_Library_set_defs,slideshow,\
))
endif
+$(eval $(call gb_Library_add_api,slideshow,\
+ offapi \
+ udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,slideshow,\
avmedia \
basegfx \
commit b9d000b81057c04f26fdfab0aada40bf980c5526
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon May 30 18:05:36 2011 +0200
ause130: #i117218# change .idl handling to gnu make
diff --git a/animations/prj/build.lst b/animations/prj/build.lst
index 276f25e..ef1b094 100644
--- a/animations/prj/build.lst
+++ b/animations/prj/build.lst
@@ -1,3 +1,3 @@
-animations animations : cppuhelper comphelper offuh LIBXSLT:libxslt NULL
+animations animations : cppuhelper comphelper offapi LIBXSLT:libxslt NULL
animations animations usr1 - all animations_mkout NULL
animations animations\source\animcore nmake - all animations_animcore NULL
diff --git a/slideshow/prj/build.lst b/slideshow/prj/build.lst
index 30c3d3a..71b351b 100644
--- a/slideshow/prj/build.lst
+++ b/slideshow/prj/build.lst
@@ -1,3 +1,3 @@
-pe slideshow : tools sal cppu vcl comphelper cppuhelper offuh cppcanvas basegfx svtools unotools toolkit animations avmedia MESA:Mesa LIBXSLT:libxslt NULL
+pe slideshow : tools sal cppu vcl comphelper cppuhelper offapi cppcanvas basegfx svtools unotools toolkit animations avmedia MESA:Mesa LIBXSLT:libxslt NULL
pe slideshow usr1 - all pe_mkout NULL
pe slideshow\prj nmake - all pe_prj NULL
More information about the Libreoffice-commits
mailing list