Author: ydario
Date: Sat Dec 1 08:53:37 2012
New Revision: 1415951
URL: http://svn.apache.org/viewvc?rev=1415951&view=rev
Log:
i118923 - OS/2 port: build import libraries from .def file instead of .dll,
allows export by ordinal for faster loading.
Modified:
openoffice/trunk/main/solenv/gbuild/platform/os2.mk
openoffice/trunk/main/solenv/inc/_tg_def.mk
openoffice/trunk/main/solenv/inc/_tg_shl.mk
openoffice/trunk/main/solenv/inc/os2gcci.mk
openoffice/trunk/main/solenv/inc/tg_def.mk
openoffice/trunk/main/solenv/inc/tg_shl.mk
Modified: openoffice/trunk/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/os2.mk?rev=1415951&r1=1415950&r2=1415951&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/os2.mk Sat Dec 1 08:53:37 2012
@@ -317,6 +317,8 @@ $(call gb_Helper_abbreviate_dirs_native,
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(PCHOBJS))) && \
+ $(if $(DLLTARGET), echo EXPORTS >> $(DLLDEF) &&) \
+ $(if $(DLLTARGET), emxexp @$${RESPONSEFILE} | fix_exp_file | sort |
uniq | fix_def_ord >> $(DLLDEF) &&) \
$(gb_LINK) \
$(if $(filter Library
CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(if $(filter
StaticLibrary,$(TARGETTYPE)),$(gb_StaticLibrary_TARGETTYPEFLAGS)) \
@@ -330,7 +332,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(if $(DLLTARGET),-o $(DLLTARGET), -o $(1) ); \
RC=$$?; rm $${RESPONSEFILE} \
- $(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLTARGET) ) \
+ $(if $(DLLTARGET),; emximp -p2048 -o $(1) $(DLLDEF) ) \
$(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) && false;
fi) ; exit $$RC)
endef
Modified: openoffice/trunk/main/solenv/inc/_tg_def.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/_tg_def.mk?rev=1415951&r1=1415950&r2=1415951&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/_tg_def.mk (original)
+++ openoffice/trunk/main/solenv/inc/_tg_def.mk Sat Dec 1 08:53:37 2012
@@ -283,8 +283,12 @@ $(DEF1TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL1IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL1IMPLIBN) $(SHL1IMPLIBN:s/.lib/.a/)
+.IF "$(SHL1USE_EXPORTS)"=="" || "$(SHL1USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL1TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL1TARGETN:b).lib $@
+.ENDIF # "$(SHL1USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -563,8 +567,12 @@ $(DEF2TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL2IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL2IMPLIBN) $(SHL2IMPLIBN:s/.lib/.a/)
+.IF "$(SHL2USE_EXPORTS)"=="" || "$(SHL2USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL2TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL2TARGETN:b).lib $@
+.ENDIF # "$(SHL2USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -843,8 +851,12 @@ $(DEF3TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL3IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL3IMPLIBN) $(SHL3IMPLIBN:s/.lib/.a/)
+.IF "$(SHL3USE_EXPORTS)"=="" || "$(SHL3USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL3TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL3TARGETN:b).lib $@
+.ENDIF # "$(SHL3USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -1123,8 +1135,12 @@ $(DEF4TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL4IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL4IMPLIBN) $(SHL4IMPLIBN:s/.lib/.a/)
+.IF "$(SHL4USE_EXPORTS)"=="" || "$(SHL4USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL4TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL4TARGETN:b).lib $@
+.ENDIF # "$(SHL4USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -1403,8 +1419,12 @@ $(DEF5TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL5IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL5IMPLIBN) $(SHL5IMPLIBN:s/.lib/.a/)
+.IF "$(SHL5USE_EXPORTS)"=="" || "$(SHL5USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL5TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL5TARGETN:b).lib $@
+.ENDIF # "$(SHL5USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -1683,8 +1703,12 @@ $(DEF6TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL6IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL6IMPLIBN) $(SHL6IMPLIBN:s/.lib/.a/)
+.IF "$(SHL6USE_EXPORTS)"=="" || "$(SHL6USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL6TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL6TARGETN:b).lib $@
+.ENDIF # "$(SHL6USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -1963,8 +1987,12 @@ $(DEF7TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL7IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL7IMPLIBN) $(SHL7IMPLIBN:s/.lib/.a/)
+.IF "$(SHL7USE_EXPORTS)"=="" || "$(SHL7USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL7TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL7TARGETN:b).lib $@
+.ENDIF # "$(SHL7USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -2243,8 +2271,12 @@ $(DEF8TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL8IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL8IMPLIBN) $(SHL8IMPLIBN:s/.lib/.a/)
+.IF "$(SHL8USE_EXPORTS)"=="" || "$(SHL8USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL8TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL8TARGETN:b).lib $@
+.ENDIF # "$(SHL8USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -2523,8 +2555,12 @@ $(DEF9TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL9IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL9IMPLIBN) $(SHL9IMPLIBN:s/.lib/.a/)
+.IF "$(SHL9USE_EXPORTS)"=="" || "$(SHL9USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL9TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL9TARGETN:b).lib $@
+.ENDIF # "$(SHL9USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
@@ -2803,8 +2839,12 @@ $(DEF10TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL10IMPLIBN:s/.lib/.a/) $@
- $(COMMAND_ECHO)+emxomf -o $(SHL10IMPLIBN) $(SHL10IMPLIBN:s/.lib/.a/)
+.IF "$(SHL10USE_EXPORTS)"=="" || "$(SHL10USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL10TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL10TARGETN:b).lib $@
+.ENDIF # "$(SHL10USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
Modified: openoffice/trunk/main/solenv/inc/_tg_shl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/_tg_shl.mk?rev=1415951&r1=1415950&r2=1415951&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/_tg_shl.mk (original)
+++ openoffice/trunk/main/solenv/inc/_tg_shl.mk Sat Dec 1 08:53:37 2012
@@ -48,7 +48,7 @@ SHL1RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL1RPATH)*=/ERROR:/Bad_SHL1RPATH_value
SHL1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL1RPATH))
-.IF "$(SHL1USE_EXPORTS)"==""
+.IF "$(SHL1USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL1DEF*=$(MISC)/$(SHL1TARGET).def
.ENDIF # "$(SHL1USE_EXPORTS)"==""
@@ -544,8 +544,11 @@ $(SHL1TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL1IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL1TARGET).lib
$@
+.IF "$(SHL1USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL1TARGETN:b).lib $@
+.ENDIF # "$(SHL1USE_EXPORTS)"==""
.IF "$(SHL1TARGET8)" != "$(SHL1TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL1TARGET8).dll
@@ -585,7 +588,7 @@ SHL2RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL2RPATH)*=/ERROR:/Bad_SHL2RPATH_value
SHL2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL2RPATH))
-.IF "$(SHL2USE_EXPORTS)"==""
+.IF "$(SHL2USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL2DEF*=$(MISC)/$(SHL2TARGET).def
.ENDIF # "$(SHL2USE_EXPORTS)"==""
@@ -1081,8 +1084,11 @@ $(SHL2TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL2IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL2TARGET).lib
$@
+.IF "$(SHL2USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL2TARGETN:b).lib $@
+.ENDIF # "$(SHL2USE_EXPORTS)"==""
.IF "$(SHL2TARGET8)" != "$(SHL2TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL2TARGET8).dll
@@ -1122,7 +1128,7 @@ SHL3RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL3RPATH)*=/ERROR:/Bad_SHL3RPATH_value
SHL3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL3RPATH))
-.IF "$(SHL3USE_EXPORTS)"==""
+.IF "$(SHL3USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL3DEF*=$(MISC)/$(SHL3TARGET).def
.ENDIF # "$(SHL3USE_EXPORTS)"==""
@@ -1618,8 +1624,11 @@ $(SHL3TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL3IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL3TARGET).lib
$@
+.IF "$(SHL3USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL3TARGETN:b).lib $@
+.ENDIF # "$(SHL3USE_EXPORTS)"==""
.IF "$(SHL3TARGET8)" != "$(SHL3TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL3TARGET8).dll
@@ -1659,7 +1668,7 @@ SHL4RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL4RPATH)*=/ERROR:/Bad_SHL4RPATH_value
SHL4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL4RPATH))
-.IF "$(SHL4USE_EXPORTS)"==""
+.IF "$(SHL4USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL4DEF*=$(MISC)/$(SHL4TARGET).def
.ENDIF # "$(SHL4USE_EXPORTS)"==""
@@ -2155,8 +2164,11 @@ $(SHL4TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL4IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL4TARGET).lib
$@
+.IF "$(SHL4USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL4TARGETN:b).lib $@
+.ENDIF # "$(SHL4USE_EXPORTS)"==""
.IF "$(SHL4TARGET8)" != "$(SHL4TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL4TARGET8).dll
@@ -2196,7 +2208,7 @@ SHL5RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL5RPATH)*=/ERROR:/Bad_SHL5RPATH_value
SHL5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL5RPATH))
-.IF "$(SHL5USE_EXPORTS)"==""
+.IF "$(SHL5USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL5DEF*=$(MISC)/$(SHL5TARGET).def
.ENDIF # "$(SHL5USE_EXPORTS)"==""
@@ -2692,8 +2704,11 @@ $(SHL5TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL5IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL5TARGET).lib
$@
+.IF "$(SHL5USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL5TARGETN:b).lib $@
+.ENDIF # "$(SHL5USE_EXPORTS)"==""
.IF "$(SHL5TARGET8)" != "$(SHL5TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL5TARGET8).dll
@@ -2733,7 +2748,7 @@ SHL6RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL6RPATH)*=/ERROR:/Bad_SHL6RPATH_value
SHL6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL6RPATH))
-.IF "$(SHL6USE_EXPORTS)"==""
+.IF "$(SHL6USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL6DEF*=$(MISC)/$(SHL6TARGET).def
.ENDIF # "$(SHL6USE_EXPORTS)"==""
@@ -3229,8 +3244,11 @@ $(SHL6TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL6IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL6TARGET).lib
$@
+.IF "$(SHL6USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL6TARGETN:b).lib $@
+.ENDIF # "$(SHL6USE_EXPORTS)"==""
.IF "$(SHL6TARGET8)" != "$(SHL6TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL6TARGET8).dll
@@ -3270,7 +3288,7 @@ SHL7RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL7RPATH)*=/ERROR:/Bad_SHL7RPATH_value
SHL7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL7RPATH))
-.IF "$(SHL7USE_EXPORTS)"==""
+.IF "$(SHL7USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL7DEF*=$(MISC)/$(SHL7TARGET).def
.ENDIF # "$(SHL7USE_EXPORTS)"==""
@@ -3766,8 +3784,11 @@ $(SHL7TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL7IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL7TARGET).lib
$@
+.IF "$(SHL7USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL7TARGETN:b).lib $@
+.ENDIF # "$(SHL7USE_EXPORTS)"==""
.IF "$(SHL7TARGET8)" != "$(SHL7TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL7TARGET8).dll
@@ -3807,7 +3828,7 @@ SHL8RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL8RPATH)*=/ERROR:/Bad_SHL8RPATH_value
SHL8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL8RPATH))
-.IF "$(SHL8USE_EXPORTS)"==""
+.IF "$(SHL8USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL8DEF*=$(MISC)/$(SHL8TARGET).def
.ENDIF # "$(SHL8USE_EXPORTS)"==""
@@ -4303,8 +4324,11 @@ $(SHL8TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL8IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL8TARGET).lib
$@
+.IF "$(SHL8USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL8TARGETN:b).lib $@
+.ENDIF # "$(SHL8USE_EXPORTS)"==""
.IF "$(SHL8TARGET8)" != "$(SHL8TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL8TARGET8).dll
@@ -4344,7 +4368,7 @@ SHL9RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL9RPATH)*=/ERROR:/Bad_SHL9RPATH_value
SHL9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL9RPATH))
-.IF "$(SHL9USE_EXPORTS)"==""
+.IF "$(SHL9USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL9DEF*=$(MISC)/$(SHL9TARGET).def
.ENDIF # "$(SHL9USE_EXPORTS)"==""
@@ -4840,8 +4864,11 @@ $(SHL9TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL9IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL9TARGET).lib
$@
+.IF "$(SHL9USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL9TARGETN:b).lib $@
+.ENDIF # "$(SHL9USE_EXPORTS)"==""
.IF "$(SHL9TARGET8)" != "$(SHL9TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL9TARGET8).dll
@@ -4881,7 +4908,7 @@ SHL10RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL10RPATH)*=/ERROR:/Bad_SHL10RPATH_value
SHL10LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL10RPATH))
-.IF "$(SHL10USE_EXPORTS)"==""
+.IF "$(SHL10USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL10DEF*=$(MISC)/$(SHL10TARGET).def
.ENDIF # "$(SHL10USE_EXPORTS)"==""
@@ -5377,8 +5404,11 @@ $(SHL10TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL10IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(LB)/$(SHL10TARGET).lib
$@
+.IF "$(SHL10USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(LB)/$(SHL10TARGETN:b).lib $@
+.ENDIF # "$(SHL10USE_EXPORTS)"==""
.IF "$(SHL10TARGET8)" != "$(SHL10TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL10TARGET8).dll
@@ -5430,10 +5460,10 @@ $(SHL1IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL1VERSIONOBJ)
- +@echo build of $(SHL1TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5484,10 +5514,10 @@ $(SHL2IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL2VERSIONOBJ)
- +@echo build of $(SHL2TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5538,10 +5568,10 @@ $(SHL3IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL3VERSIONOBJ)
- +@echo build of $(SHL3TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5592,10 +5622,10 @@ $(SHL4IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL4VERSIONOBJ)
- +@echo build of $(SHL4TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5646,10 +5676,10 @@ $(SHL5IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL5VERSIONOBJ)
- +@echo build of $(SHL5TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5700,10 +5730,10 @@ $(SHL6IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL6VERSIONOBJ)
- +@echo build of $(SHL6TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5754,10 +5784,10 @@ $(SHL7IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL7VERSIONOBJ)
- +@echo build of $(SHL7TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5808,10 +5838,10 @@ $(SHL8IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL8VERSIONOBJ)
- +@echo build of $(SHL8TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5862,10 +5892,10 @@ $(SHL9IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL9VERSIONOBJ)
- +@echo build of $(SHL9TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
@@ -5916,10 +5946,10 @@ $(SHL10IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL10VERSIONOBJ)
- +@echo build of $(SHL10TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
Modified: openoffice/trunk/main/solenv/inc/os2gcci.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/os2gcci.mk?rev=1415951&r1=1415950&r2=1415951&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/os2gcci.mk (original)
+++ openoffice/trunk/main/solenv/inc/os2gcci.mk Sat Dec 1 08:53:37 2012
@@ -272,7 +272,7 @@ LIBMGR=emxomfar -p2048
.ENDIF
# tool for generating import libraries
-IMPLIB=emximp
+IMPLIB=emximp -p2048
IMPLIBFLAGS=-o
MAPSYM=mapsym
Modified: openoffice/trunk/main/solenv/inc/tg_def.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_def.mk?rev=1415951&r1=1415950&r2=1415951&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/tg_def.mk (original)
+++ openoffice/trunk/main/solenv/inc/tg_def.mk Sat Dec 1 08:53:37 2012
@@ -288,8 +288,12 @@ $(DEF$(TNR)TARGETN) .PHONY :
$(COMMAND_ECHO)+$(RENAME) [email protected] $@
@+-$(RM) [email protected]_ord
@+-$(RM) [email protected]
- $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN:s/.lib/.a/)
$@
- $(COMMAND_ECHO)+emxomf -o $(SHL$(TNR)IMPLIBN)
$(SHL$(TNR)IMPLIBN:s/.lib/.a/)
+.IF "$(SHL$(TNR)USE_EXPORTS)"=="" || "$(SHL$(TNR)USE_EXPORTS)"=="ordinal"
+#03/11/2012 if 'name' is not used, export from def file (with ordinals)
+ @echo Build import library from DEF file.
+ @+-$(RM) $(LB)/$(SHL$(TNR)TARGETN:b).lib
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS)
$(LB)/$(SHL$(TNR)TARGETN:b).lib $@
+.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"==""
.ENDIF # "$(GUI)"=="OS2"
Modified: openoffice/trunk/main/solenv/inc/tg_shl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/tg_shl.mk?rev=1415951&r1=1415950&r2=1415951&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/tg_shl.mk (original)
+++ openoffice/trunk/main/solenv/inc/tg_shl.mk Sat Dec 1 08:53:37 2012
@@ -53,7 +53,7 @@ SHL$(TNR)RPATH*=OOO
LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH)*=/ERROR:/Bad_SHL$(TNR)RPATH_value
SHL$(TNR)LINKFLAGS+=$(LINKFLAGSRUNPATH_$(SHL$(TNR)RPATH))
-.IF "$(SHL$(TNR)USE_EXPORTS)"==""
+.IF "$(SHL$(TNR)USE_EXPORTS)"=="" || "$(GUI)"=="OS2"
SHL$(TNR)DEF*=$(MISC)/$(SHL$(TNR)TARGET).def
.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"==""
@@ -549,8 +549,11 @@ $(SHL$(TNR)TARGETN) : \
.ENDIF # "$(USE_DEFFILE)"!=""
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN) $@
- $(COMMAND_ECHO)+$(IMPLIB) -p256 $(IMPLIBFLAGS)
$(LB)/$(SHL$(TNR)TARGET).lib $@
+.IF "$(SHL$(TNR)USE_EXPORTS)"=="name"
+#03/11/2012 if 'name' is used, export from DLL file (only names, no ordinals)
+ @echo Build import library from DLL file.
+ $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS)
$(LB)/$(SHL$(TNR)TARGETN:b).lib $@
+.ENDIF # "$(SHL$(TNR)USE_EXPORTS)"==""
.IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
$(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
@@ -609,10 +612,10 @@ $(SHL$(TNR)IMPLIBN): \
.ELIF "$(GUI)" == "OS2"
-# touch creates an empty file, but this is not good for emxomfar, so
-# create a dummy lib here
- $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL$(TNR)VERSIONOBJ)
- +@echo build of $(SHL$(TNR)TARGETN) creates $@
+ @echo Import libs generated with .def file or with .dll file.
+# make 'dmake' happy
+ @-$(RM) $@
+ @$(TOUCH) $@
.ELSE
@echo no ImportLibs on Mac and *ix
