[Libreoffice-commits] .: rsc/source svl/prj

Tor Lillqvist tml at kemper.freedesktop.org
Fri Jul 22 02:30:50 PDT 2011


 rsc/source/misc/makefile.mk   |    5 +++++
 rsc/source/parser/makefile.mk |    5 +++++
 rsc/source/prj/makefile.mk    |    5 +++++
 rsc/source/res/makefile.mk    |    5 +++++
 rsc/source/rscpp/makefile.mk  |    5 +++++
 rsc/source/tools/makefile.mk  |    5 +++++
 svl/prj/build.lst             |    2 +-
 7 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 4af70269a7297ed9beabebb2f505ab5979d874d3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jul 22 12:24:18 2011 +0300

    Do build rsc also on non-desktop OSes just for rscsfx.hxx to get delivered
    
    Don't actually compile anything, though... Just the rscsfx.hxx is
    needed.

diff --git a/rsc/source/misc/makefile.mk b/rsc/source/misc/makefile.mk
index fa54366..02e6a2f 100644
--- a/rsc/source/misc/makefile.mk
+++ b/rsc/source/misc/makefile.mk
@@ -36,6 +36,11 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo No need for this on non-desktop OSes
+.ENDIF
+
 # --- Files ---------------------------------------------------------
 
 CXXFILES= 	rsclst.cxx	\
diff --git a/rsc/source/parser/makefile.mk b/rsc/source/parser/makefile.mk
index a46c60a..b128bbf 100644
--- a/rsc/source/parser/makefile.mk
+++ b/rsc/source/parser/makefile.mk
@@ -40,6 +40,11 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo No need for this on non-desktop OSes
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 YACCTARGET= $(INCCOM)$/yyrscyacc.cxx
diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk
index d496919..f703d3e 100644
--- a/rsc/source/prj/makefile.mk
+++ b/rsc/source/prj/makefile.mk
@@ -38,6 +38,11 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo No need for this on non-desktop OSes
+.ENDIF
+
 # --- Files --------------------------------------------------------------
 
 OBJFILES=   $(OBJ)$/gui.obj          \
diff --git a/rsc/source/res/makefile.mk b/rsc/source/res/makefile.mk
index 99d9d63..9f65263 100644
--- a/rsc/source/res/makefile.mk
+++ b/rsc/source/res/makefile.mk
@@ -36,6 +36,11 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo No need for this on non-desktop OSes
+.ENDIF
+
 OBJFILES=               $(OBJ)$/rscclobj.obj                         \
                         $(OBJ)$/rsccont.obj                          \
                         $(OBJ)$/rsctop.obj                           \
diff --git a/rsc/source/rscpp/makefile.mk b/rsc/source/rscpp/makefile.mk
index 980ef45..dc78ee5 100644
--- a/rsc/source/rscpp/makefile.mk
+++ b/rsc/source/rscpp/makefile.mk
@@ -41,6 +41,11 @@ TARGET=cpp
 
 .INCLUDE : settings.mk
 
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo No need for this on non-desktop OSes
+.ENDIF
+
 CDEFS+=-DSOLAR
 
 .IF "$(cpp)" != ""
diff --git a/rsc/source/tools/makefile.mk b/rsc/source/tools/makefile.mk
index 74024ca..a7e79ab 100644
--- a/rsc/source/tools/makefile.mk
+++ b/rsc/source/tools/makefile.mk
@@ -36,6 +36,11 @@ ENABLE_EXCEPTIONS=true
 
 .INCLUDE :  settings.mk
 
+.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo No need for this on non-desktop OSes
+.ENDIF
+
 OBJFILES=        $(OBJ)$/rschash.obj                          \
                  $(OBJ)$/rsctree.obj                          \
                  $(OBJ)$/rsctools.obj                         \
diff --git a/svl/prj/build.lst b/svl/prj/build.lst
index 5fc7d0e..2e01ff6 100644
--- a/svl/prj/build.lst
+++ b/svl/prj/build.lst
@@ -1,3 +1,3 @@
-sl	svl	:	TRANSLATIONS:translations DESKTOP:rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot  LIBXSLT:libxslt NULL
+sl	svl	:	TRANSLATIONS:translations rsc offapi ucbhelper unotools cppu cppuhelper comphelper sal sot  LIBXSLT:libxslt NULL
 sl	svl\prj	nmake	-	all	svl_prj NULL
 # sl	svl\qa\unit	nmake	-	all	svl_qa_cppunit svl_util NULL


More information about the Libreoffice-commits mailing list