Bypass more stuff on non-desktop OSes and enforce "lib" prefix for Android

shell/source/backends/desktopbe/makefile.mk

@@ -44,7 +44,7 @@ SHL1STDLIBS = \
     $(CPPUHELPERLIB) \
     $(CPPULIB) \
     $(SALLIB)
-SHL1TARGET = desktopbe1.uno
+SHL1TARGET = $(ENFORCEDSHLPREFIX)desktopbe1.uno
 SHL1USE_EXPORTS = name
 DEF1NAME = $(SHL1TARGET)
 

shell/source/backends/localebe/makefile.mk

@@ -47,7 +47,7 @@ SLOFILES=\
     $(SLO)$/localebecdef.obj \
     $(SLO)$/localebackend.obj
 
-SHL1TARGET=$(TARGET)1.uno   
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET)1.uno   
 SHL1OBJS=$(SLOFILES)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 

shell/source/cmdmail/makefile.mk

@@ -36,6 +36,11 @@ COMP1TYPELIST=$(TARGET)
 
 .INCLUDE :  settings.mk
 
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo Nothing done for non-desktop OSes
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 DLLPRE=

shell/source/unix/exec/makefile.mk

@@ -40,6 +40,11 @@ TESTAPP1=urltest
 
 .INCLUDE :  settings.mk
 
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo Nothing done for non-desktop OSes
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 DLLPRE=

shell/source/unix/misc/makefile.mk

@@ -38,6 +38,11 @@ LIBSALCPPRT=$(0)
 
 .INCLUDE : settings.mk
 
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo Nothing done for non-desktop OSes
+.ENDIF
+
 # --- Files --------------------------------------------------------
 
 SCRIPTFILES = \

shell/source/unix/sysshell/makefile.mk

@@ -37,6 +37,11 @@ VISIBILITY_HIDDEN = TRUE
 
 .INCLUDE : settings.mk
 
+.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+ALL:
+    @echo Nothing done for non-desktop OSes
+.ENDIF
+
 .IF "$(SYSTEM_EXPAT)" == "YES"
 CFLAGS+=-DSYSTEM_EXPAT
 .ENDIF