Author: ydario
Date: Fri Mar 2 20:13:41 2012
New Revision: 1296433
URL: http://svn.apache.org/viewvc?rev=1296433&view=rev
Log:
i118923 - OS/2 port: use system libraries for apr, apr-util, serf.
Modified:
incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
incubator/ooo/trunk/ext_libraries/apr/makefile.mk
incubator/ooo/trunk/ext_libraries/serf/makefile.mk
Modified: incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk?rev=1296433&r1=1296432&r2=1296433&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr-util/makefile.mk Fri Mar 2 20:13:41
2012
@@ -57,6 +57,12 @@ BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+.ELIF "$(GUI)" == "OS2"
+
+@all:
+ @echo "using system apr-util. nothing do do."
+
+
.ELSE
Modified: incubator/ooo/trunk/ext_libraries/apr/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/makefile.mk?rev=1296433&r1=1296432&r2=1296433&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr/makefile.mk Fri Mar 2 20:13:41 2012
@@ -45,6 +45,11 @@ BUILD_ACTION=INCLUDE="$(INCLUDE);./inclu
#INSTALL_ACTION=cp Release/libapr-1.lib $(OUTDIR)/lib/libapr-1.lib
+.ELIF "$(GUI)" == "OS2"
+
+@all:
+ @echo "using system apr. nothing do do."
+
.ELSE
CONFIGURE_DIR=
Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1296433&r1=1296432&r2=1296433&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Fri Mar 2 20:13:41 2012
@@ -61,6 +61,11 @@ BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+.ELIF "$(GUI)" == "OS2"
+
+@all:
+ @echo "using system serf. nothing do do."
+
.ELSE
.IF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD"