diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-15 13:36:58 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-04-15 14:08:09 +0300 |
| commit | 20ba3c4ae8053079bc5ec134c4c60a3aa33b5ad7 (patch) | |
| tree | 11bda8adc750e2bc15f377512d34e8215f507881 /solenv/inc/libs.mk | |
| parent | 1b7717c24244aafbb314dcf4fca2efc901fd1393 (diff) | |
Kill OS/2 stuff
Diffstat (limited to 'solenv/inc/libs.mk')
| -rw-r--r-- | solenv/inc/libs.mk | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index 52dfada097c0..3ec4bdcb2f02 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -32,7 +32,7 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$" .INCLUDE .IGNORE : ucbhelper/version.mk .INCLUDE .IGNORE : connectivity/version.mk -.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") # No ODMA on UNX ODMA_LIB_LIB= @@ -344,7 +344,7 @@ UNOPKGAPPLIB=-lunopkgapp TESTLIB=-ltest XMLREADERLIB=-lxmlreader -.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.ELSE # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") ODMA_LIB_LIB=odma_lib.lib AWTLIB*=jawt.lib @@ -364,11 +364,7 @@ LDAPBERLIB=ldapber.lib CPPULIB=icppu.lib CPPUHELPERLIB=icppuhelper.lib UCBHELPERLIB=iucbhelper.lib -.IF "$(GUI)"=="OS2" -OPENSSLLIB=ssl.lib crypto.lib -.ELSE OPENSSLLIB=ssleay32.lib libeay32.lib -.ENDIF ODBCLIB=iodbc.lib ODBCBASELIB=iodbcbase.lib DBFILELIB=ifile.lib @@ -474,11 +470,7 @@ HELPLINKERLIB=ihelplinker.lib JVMACCESSLIB = ijvmaccess.lib CPPUNITLIB = icppunit_dll.lib XSLTLIB = libxslt.lib $(LIBXML2LIB) -.IF "$(GUI)"=="OS2" -REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib -.ELSE REDLANDLIB = librdf.lib -.ENDIF JVMFWKLIB = ijvmfwk.lib @@ -522,4 +514,4 @@ TESTLIB=itest.lib BOOSTTHREADLIB=boostthread.lib XMLREADERLIB=ixmlreader.lib -.ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2" +.ENDIF # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") |