diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-25 23:51:33 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-26 00:23:45 +0200 |
| commit | c7524e944120a7f1c0da3056f97c84643f85bbd2 (patch) | |
| tree | 9a1877789d8fe4425b12eccc8a2cf7b6ff4c9cc4 /shell | |
| parent | 474dcc8fc9c4e7b2469e89b112f5bed4066cf969 (diff) | |
Bypass more stuff on non-desktop OSes and enforce "lib" prefix for Android
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/desktopbe/makefile.mk | 2 | ||||
| -rw-r--r-- | shell/source/backends/localebe/makefile.mk | 2 | ||||
| -rw-r--r-- | shell/source/cmdmail/makefile.mk | 5 | ||||
| -rw-r--r-- | shell/source/unix/exec/makefile.mk | 5 | ||||
| -rw-r--r-- | shell/source/unix/misc/makefile.mk | 5 | ||||
| -rw-r--r-- | shell/source/unix/sysshell/makefile.mk | 5 |
6 files changed, 22 insertions, 2 deletions
diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk index 66ad8cf99e1e..7c6d6381a5a8 100644 --- a/shell/source/backends/desktopbe/makefile.mk +++ b/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) diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk index 1efe3ed5e498..33b741230e61 100644 --- a/shell/source/backends/localebe/makefile.mk +++ b/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 diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk index e4d5ec48b925..b442d68659a4 100644 --- a/shell/source/cmdmail/makefile.mk +++ b/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= diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk index 4f07341f4dde..07b312545288 100644 --- a/shell/source/unix/exec/makefile.mk +++ b/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= diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk index 840f37295522..cb1a98622160 100644 --- a/shell/source/unix/misc/makefile.mk +++ b/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 = \ diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk index 0c9f942d4d6a..6e9558ab1346 100644 --- a/shell/source/unix/sysshell/makefile.mk +++ b/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 |