[Libreoffice-commits] .: 4 commits - accessibility/prj cui/Library_cui.mk embedserv/prj extensions/prj forms/Library_frm.mk setup_native/source UnoControls/prj

Sat Jun 18 02:32:36 PDT 2011

UnoControls/prj/build.lst                                 |    2 +-
 accessibility/prj/build.lst                               |    2 +-
 cui/Library_cui.mk                                        |    6 +++++-
 embedserv/prj/build.lst                                   |    2 +-
 extensions/prj/build.lst                                  |    2 +-
 forms/Library_frm.mk                                      |    7 ++++++-
 setup_native/source/win32/customactions/reg64/makefile.mk |    1 -
 7 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 7a90746dcd2db06fc641d6c0cb0bc97e3f0f4bb9
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 31 19:39:01 2011 +0200

    needs oovbaapi too

diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 72d0642..be649b4 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Library_set_defs,frm,\
 
 $(eval $(call gb_Library_add_api,frm,\
     offapi \
+    oovbaapi \
     udkapi \
 ))
 
commit f327755e3e1f3aad075c49981f35b04d7df2ac24
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 30 18:47:52 2011 +0200

    remove all traces of offuh from makefiles

diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6e3bf19..5567650 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,cui,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/cui/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,cui,\
@@ -45,6 +44,11 @@ $(eval $(call gb_Library_set_defs,cui,\
     $(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
 ))
 
+$(eval $(call gb_Library_add_api,cui,\
+    offapi \
+    udkapi \
+))
+
 # .IF "$(ENABLE_LAYOUT)" == "TRUE"
 # CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
 # .ENDIF # ENABLE_LAYOUT == TRUE
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 1208fa5..72d0642 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_set_include,frm,\
     -I$(realpath $(SRCDIR)/forms/source/inc) \
     -I$(realpath $(SRCDIR)/forms/source/solar/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
     $(if $(filter YES,$(SYSTEM_LIBXML)),$(filter -I%,$(LIBXML_CFLAGS))) \
 ))
 
@@ -44,6 +43,11 @@ $(eval $(call gb_Library_set_defs,frm,\
     $(if $(filter YES,$(SYSTEM_LIBXML)),-DSYSTEM_LIBXML $(filter-out -I%,$(LIBXML_CFLAGS))) \
 ))
 
+$(eval $(call gb_Library_add_api,frm,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,frm,\
     comphelper \
     cppu \
commit 2d8a0392abbf90c13510cb2992be490f56e066c0
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon May 30 18:19:32 2011 +0200

    ause130: #i117218# don't export INCLUDE in a local makefile.mk

diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk
index 4cb5a5c..023aee5 100644
--- a/setup_native/source/win32/customactions/reg64/makefile.mk
+++ b/setup_native/source/win32/customactions/reg64/makefile.mk
@@ -74,4 +74,3 @@ DEF1EXPORTFILE=exports.dxp
 
 .INCLUDE : target.mk
 INCLUDE!:=$(subst,/stl, $(INCLUDE))
-.EXPORT : INCLUDE
commit 6355b99e4f86bdec14e93e8ceba52c1b151b16f0
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon May 30 18:05:15 2011 +0200

    ause130: #i117218# change .idl handling to gnu make

diff --git a/UnoControls/prj/build.lst b/UnoControls/prj/build.lst
index 775cb90..473776f 100644
--- a/UnoControls/prj/build.lst
+++ b/UnoControls/prj/build.lst
@@ -1,4 +1,4 @@
-us	UnoControls	: LIBXSLT:libxslt cppuhelper offuh tools NULL
+us	UnoControls	: LIBXSLT:libxslt cppuhelper offapi tools NULL
 us	UnoControls								usr1	-	all	us_mkout NULL
 us	UnoControls\source\base					nmake	-	all	us_base NULL
 us	UnoControls\source\controls				nmake	-	all	us_ctrls NULL
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index 469a59e..6169221 100644
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,4 +1,4 @@
-ac  accessibility	:    TRANSLATIONS:translations tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
+ac  accessibility	:    TRANSLATIONS:translations tools jurt offapi unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
 ac	accessibility                                         	usr1	-	all	ac_mkout NULL
 ac	accessibility\inc                                      	nmake	-	all	ac_inc NULL
 ac	accessibility\bridge\org\openoffice\java\accessibility	nmake	-	w	ac_ooja ac_inc NULL
diff --git a/embedserv/prj/build.lst b/embedserv/prj/build.lst
index 189479e..a6cfd10 100644
--- a/embedserv/prj/build.lst
+++ b/embedserv/prj/build.lst
@@ -1,4 +1,4 @@
-es	embedserv	:	offuh sal cppu cppuhelper comphelper LIBXSLT:libxslt NULL
+es	embedserv	:	offapi sal cppu cppuhelper comphelper LIBXSLT:libxslt NULL
 es	embedserv								usr1	-	w	es_mkout NULL
 es	embedserv\source\embed					nmake	-	w	es_embed NULL
 es	embedserv\source\inprocserv				nmake	-	w	es_inproc NULL
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index f39f665..b3e7b22 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg  TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
+ex  extensions :  officecfg  TRANSLATIONS:translations DESKTOP:rdbmaker svx SANE:sane TWAIN:twain np_sdk offapi stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
