[Libreoffice-commits] .: sal/osl sal/util

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Mar 24 14:47:19 PDT 2011


 sal/osl/unx/makefile.mk |    6 ------
 sal/util/makefile.mk    |    9 ---------
 2 files changed, 15 deletions(-)

New commits:
commit a7a3ebf928ec20a0ef53e964ebacecabbe293abf
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Mar 24 22:32:02 2011 +0100

    Kill the remnants of the PAM removal (PAM_LINK and CRYPT_LINK).

diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk
index 31bdf99..6fb6768 100644
--- a/sal/osl/unx/makefile.mk
+++ b/sal/osl/unx/makefile.mk
@@ -127,12 +127,6 @@ OBJFILES += $(OBJ)$/backtrace.obj
 APP1STDLIBS+=-lC
 .ENDIF
 
-.IF "$(OS)" == "LINUX"
-.IF "$(CRYPT_LINK)" == "YES"
-CFLAGS+=-DCRYPT_LINK
-.ENDIF
-.ENDIF
-
 .IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == ""
 CFLAGS+=-DSAL_ENABLE_CRASH_REPORT
 .ENDIF
diff --git a/sal/util/makefile.mk b/sal/util/makefile.mk
index 009a131..f0076ea 100644
--- a/sal/util/makefile.mk
+++ b/sal/util/makefile.mk
@@ -125,15 +125,6 @@ SHL1STDLIBS=pthread.lib
 SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
 .ENDIF
 
-.IF "$(OS)" == "LINUX"
-.IF "$(PAM_LINK)" == "YES"
-SHL1STDLIBS+=-lpam
-.ENDIF
-.IF "$(CRYPT_LINK)" == "YES"
-SHL1STDLIBS+=-lcrypt
-.ENDIF
-.ENDIF
-
 SHL1LIBS+=$(SLB)$/$(TARGET).lib
 
 .IF "$(linkinc)" != ""


More information about the Libreoffice-commits mailing list