diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-12-13 01:59:12 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2011-12-13 01:59:12 +0100 |
| commit | 89b4260fc9ddc39ebc36ea44723f101aabf1d043 (patch) | |
| tree | a29840dfb71ae55019868c66493341cfd5742a6c | |
| parent | 9b98c4a8d780ec62f346d9d39cc61e45d0e38a17 (diff) | |
GUI is also UNX for Mac, to check for Mac use either OS→MACOSX or GUIBASE→aqua
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 11 | ||||
| -rw-r--r-- | cppuhelper/test/bootstrap/makefile.mk | 2 | ||||
| -rw-r--r-- | lingucomponent/source/languageguessing/makefile.mk | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 3f9bfb5d1d89..1fd0481160dd 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -91,16 +91,9 @@ LIBPQ_DEP_LIBS+=\ .ENDIF .ELSE LIBPQ_LINK=$(OUTDIR)/lib/libpq.a -.IF "$(GUI)"=="MAC" -LIBPQ_DEP_LIBS += -Wl,-dead_strip_dylibs -.ELSE -LIBPQ_DEP_LIBS += -Wl,--as-needed -.ENDIF +LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX -Wl,-dead_strip_dylibs -Wl,--as-needed) .INCLUDE : $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk -.IF "$(GUI)"=="MAC" -.ELSE -LIBPQ_DEP_LIBS += -Wl,--no-as-needed -.ENDIF +LIBPQ_DEP_LIBS+=$(eq,$(OS),MACOSX $(NULL) -Wl,--no-as-needed) .ENDIF POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql POSTGRESQL_LIB= diff --git a/cppuhelper/test/bootstrap/makefile.mk b/cppuhelper/test/bootstrap/makefile.mk index 86665df391bf..d1caebad26e2 100644 --- a/cppuhelper/test/bootstrap/makefile.mk +++ b/cppuhelper/test/bootstrap/makefile.mk @@ -37,7 +37,7 @@ USE_DEFFILE := TRUE .INCLUDE : settings.mk -.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" +.IF "$(GUI)"=="UNX" PURPENVHELPERLIB := -luno_purpenvhelper$(COMID) .ELSE diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk index 5fe1945ed60d..65036dbb282c 100644 --- a/lingucomponent/source/languageguessing/makefile.mk +++ b/lingucomponent/source/languageguessing/makefile.mk @@ -39,19 +39,19 @@ VISIBILITY_HIDDEN=TRUE # --- Files -------------------------------------------------------- -.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" +.IF "$(GUI)"=="UNX" .IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES" LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS) .ELSE LIBTEXTCATLIB=-lexttextcat .ENDIF -.ELSE # "$(GUI)"=="UNX" || "$(GUI)"=="MAC" +.ELSE # "$(GUI)"=="UNX" .IF "$(COM)"=="GCC" LIBTEXTCATLIB=-lilibexttextcat .ELSE LIBTEXTCATLIB=ilibexttextcat.lib .ENDIF -.ENDIF # "$(GUI)"=="UNX" || "$(GUI)"=="MAC" +.ENDIF # "$(GUI)"=="UNX" SLOFILES = \ $(SLO)$/altstrfunc.obj \ |