Author: ydario
Date: Tue Jul 17 14:28:51 2012
New Revision: 1362509
URL: http://svn.apache.org/viewvc?rev=1362509&view=rev
Log:
i118923 - OS/2 port: fix build and installation of binfilter modules.
Modified:
incubator/ooo/trunk/main/binfilter/bf_sc/util/makefile.mk
incubator/ooo/trunk/main/binfilter/bf_sd/util/makefile.mk
incubator/ooo/trunk/main/binfilter/bf_sw/util/makefile.mk
incubator/ooo/trunk/main/binfilter/filter/source/bf_migrate/makefile.mk
incubator/ooo/trunk/main/scp2/source/binfilter/file_binfilter.scp
incubator/ooo/trunk/main/solenv/inc/libs.mk
Modified: incubator/ooo/trunk/main/binfilter/bf_sc/util/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_sc/util/makefile.mk?rev=1362509&r1=1362508&r2=1362509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_sc/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/binfilter/bf_sc/util/makefile.mk Tue Jul 17
14:28:51 2012
@@ -164,7 +164,6 @@ $(MISC)$/$(SHL1TARGET).def: makefile.mk
@echo ------------------------------
@echo Making: $@
@echo LIBRARY $(SHL1TARGET8) INITINSTANCE TERMINSTANCE >$@
- @echo DESCRIPTION 'SCALC3 DLL' >>$@
@echo DATA MULTIPLE >>$@
@echo EXPORTS >>$@
@echo _CreateScDocShellDll >>$@
Modified: incubator/ooo/trunk/main/binfilter/bf_sd/util/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_sd/util/makefile.mk?rev=1362509&r1=1362508&r2=1362509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_sd/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/binfilter/bf_sd/util/makefile.mk Tue Jul 17
14:28:51 2012
@@ -140,7 +140,6 @@ $(MISC)$/$(SHL1TARGET).def:
@echo ------------------------------
@echo Making: $@
@echo LIBRARY $(SHL1TARGET8) INITINSTANCE TERMINSTANCE >$@
- @echo DESCRIPTION 'SDRAW3 DLL' >>$@
@echo DATA MULTIPLE >>$@
@echo EXPORTS >>$@
@echo _CreateSdDrawDocShellDll >>$@
Modified: incubator/ooo/trunk/main/binfilter/bf_sw/util/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/bf_sw/util/makefile.mk?rev=1362509&r1=1362508&r2=1362509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/bf_sw/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/binfilter/bf_sw/util/makefile.mk Tue Jul 17
14:28:51 2012
@@ -181,7 +181,6 @@ $(MISC)$/$(SHL2TARGET).def: makefile.mk
@echo ------------------------------
@echo Making: $@
@echo LIBRARY $(SHL2TARGET8) INITINSTANCE TERMINSTANCE >$@
- @echo DESCRIPTION 'SWriter4 DLL' >>$@
@echo DATA MULTIPLE >>$@
@echo EXPORTS >>$@
@echo _CreateSwDocShellDll >>$@
Modified:
incubator/ooo/trunk/main/binfilter/filter/source/bf_migrate/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/binfilter/filter/source/bf_migrate/makefile.mk?rev=1362509&r1=1362508&r2=1362509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/binfilter/filter/source/bf_migrate/makefile.mk
(original)
+++ incubator/ooo/trunk/main/binfilter/filter/source/bf_migrate/makefile.mk Tue
Jul 17 14:28:51 2012
@@ -51,7 +51,11 @@ SLOFILES= $(SLO)$/bf_migrateexports.obj
# --- Library -----------------------------------
+.IF "$(OS)" == "OS2"
+SHL1TARGET=bf_migra$(DLLPOSTFIX)
+.ELSE
SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
+.ENDIF
SHL1STDLIBS=$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
Modified: incubator/ooo/trunk/main/scp2/source/binfilter/file_binfilter.scp
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/binfilter/file_binfilter.scp?rev=1362509&r1=1362508&r2=1362509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/binfilter/file_binfilter.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/binfilter/file_binfilter.scp Tue Jul
17 14:28:51 2012
@@ -52,10 +52,19 @@ STD_LIB_FILE( gid_File_Lib_Bf_Sc, bf_sc)
STD_LIB_FILE( gid_File_Lib_Bf_Sd, bf_sd)
STD_LIB_FILE( gid_File_Lib_Bf_Sm, bf_sm)
STD_LIB_FILE( gid_File_Lib_Bf_Sw, bf_sw)
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapp)
+STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_b)
+#else
STD_LIB_FILE( gid_File_Lib_Bf_Wrapper, bf_wrapper)
STD_LIB_FILE( gid_File_Lib_Legacy_Binfilters, legacy_binfilters)
+#endif
+#ifdef OS2
+STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migra)
+#else
STD_LIB_FILE( gid_File_Lib_Bf_Migratefilter, bf_migratefilter)
+#endif
STD_LIB_FILE( gid_File_Lib_Bindet, bindet)
STD_RES_FILE( gid_File_Res_Bf_Sch, bf_sch )
Modified: incubator/ooo/trunk/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/libs.mk?rev=1362509&r1=1362508&r2=1362509&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/libs.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/libs.mk Tue Jul 17 14:28:51 2012
@@ -214,7 +214,7 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
+.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" &&
"$(OS)" != "OS2"
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
