diff options
| -rw-r--r-- | curl/makefile.mk | 13 | ||||
| -rw-r--r-- | hunspell/makefile.mk | 4 | ||||
| -rwxr-xr-x | libxml2/makefile.mk | 5 | ||||
| -rw-r--r-- | neon/neon.patch | 5 | ||||
| -rw-r--r-- | python/pyversion.mk | 3 |
5 files changed, 1 insertions, 29 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index dfcb77fa1ce4..7588a4859b2a 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -135,19 +135,6 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib .ENDIF .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_DIR=.$/lib -.IF "$(debug)"=="" -BUILD_ACTION=make -f Makefile.os2 -.ELSE -BUILD_ACTION=make -f Makefile.os2 -.ENDIF - -OUT2BIN=$(BUILD_DIR)$/libcurl.dll -OUT2LIB=$(BUILD_DIR)$/libcurl.lib - -.ENDIF # "$(GUI)"=="OS2" - OUT2INC= \ include$/curl$/easy.h \ include$/curl$/multi.h \ diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk index 9c213a4d9a9a..6ab9b36cc877 100644 --- a/hunspell/makefile.mk +++ b/hunspell/makefile.mk @@ -87,10 +87,6 @@ BUILD_ACTION=cd src/hunspell && dmake .ENDIF .ENDIF # "$(GUI)"=="WNT" -.IF "$(GUI)"=="OS2" -BUILD_ACTION=cd src/hunspell && dmake -.ENDIF # "$(GUI)"=="OS2" - OUT2INC= \ $(BUILD_DIR)$/src$/hunspell$/*.hxx \ $(BUILD_DIR)$/src$/hunspell$/*.h diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 9e69e67f67e2..f037648132db 100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -97,13 +97,8 @@ xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" CONFIGURE_DIR= -.IF "$(OS)"=="OS2" -CONFIGURE_ACTION=sh .$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" -.ELSE CONFIGURE_ACTION=.$/configure CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared --disable-static --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" -.ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) diff --git a/neon/neon.patch b/neon/neon.patch index 0f5669152a28..b7a3f8514335 100644 --- a/neon/neon.patch +++ b/neon/neon.patch @@ -492,7 +492,7 @@ +#endif --- misc/neon-0.29.5/src/makefile.mk 2011-02-03 10:32:38.000000000 +0100 +++ misc/build/neon-0.29.5/src/makefile.mk 2011-02-03 10:26:19.000000000 +0100 -@@ -1,1 +1,99 @@ +@@ -1,1 +1,96 @@ -dummy +PRJ=..$/..$/..$/..$/.. + @@ -578,9 +578,6 @@ + .IF "$(OS)"=="SOLARIS" + SHL1STDLIBS+= -lnsl -lsocket -ldl + .ENDIF # SOLARIS -+ .IF "$(OS)"=="OS2" -+ SHL1STDLIBS+= pthread.lib libz.lib -+ .ENDIF # OS2 + .IF "$(SYSTEM_OPENSSL)"=="YES" + SHL1STDLIBS+= $(OPENSSLLIB) + .ELSE diff --git a/python/pyversion.mk b/python/pyversion.mk index 55a616b12064..71b5acffd278 100644 --- a/python/pyversion.mk +++ b/python/pyversion.mk @@ -12,9 +12,6 @@ PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dylib PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0 .ENDIF PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR) -.ELIF "$(GUI)" == "OS2" -PY_FULL_DLL_NAME=python$(PYMAJOR)$(PYMINOR).dll -PYTHONLIB=python$(PYMAJOR)$(PYMINOR).lib .ELSE .IF "$(COM)" == "GCC" PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).dll |