Reorder the SHL1STDLIBS librarys
This commit is contained in:
parent
8f4a5dd1d1
commit
1ff4042d1c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=55641
@ -0,0 +1,13 @@
|
||||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
@ -0,0 +1,13 @@
|
||||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
|
||||
+++ ../comphelper/util/makefile.mk
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,15 @@
|
||||
--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
|
||||
+++ ../comphelper/util/makefile.mk
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,15 @@
|
||||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/cmdmail/makefile.mk
|
||||
@@ -81,9 +81,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/proxysettings/makefile.mk
|
||||
@@ -85,9 +85,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/unix/exec/makefile.mk
|
||||
@@ -79,9 +79,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/cmdmail/makefile.mk
|
||||
@@ -81,9 +81,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/proxysettings/makefile.mk
|
||||
@@ -85,9 +85,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/unix/exec/makefile.mk
|
||||
@@ -79,9 +79,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/corereflection/makefile.mk
|
||||
@@ -87,9 +87,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/defaultregistry/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/implementationregistration/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/inspect/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation_adapterfactory/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javaloader/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPULIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javavm/makefile.mk
|
||||
@@ -91,10 +91,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(UNOLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(UNOLIB)
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL1STDLIBS += advapi32.lib
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/loader/makefile.mk
|
||||
@@ -83,9 +83,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/namingservice/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/proxy_factory/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB=i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/registry_tdprovider/makefile.mk
|
||||
@@ -88,10 +88,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(SALHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/servicemanager/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/tdmanager/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/typeconv/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/corereflection/makefile.mk
|
||||
@@ -87,9 +87,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/defaultregistry/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/implementationregistration/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/inspect/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation_adapterfactory/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javaloader/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPULIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javavm/makefile.mk
|
||||
@@ -91,10 +91,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(UNOLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(UNOLIB)
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL1STDLIBS += advapi32.lib
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/loader/makefile.mk
|
||||
@@ -83,9 +83,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/namingservice/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/proxy_factory/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB=i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/registry_tdprovider/makefile.mk
|
||||
@@ -88,10 +88,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(SALHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/servicemanager/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/tdmanager/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/typeconv/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
@ -0,0 +1,13 @@
|
||||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
@ -0,0 +1,13 @@
|
||||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
|
||||
+++ ../comphelper/util/makefile.mk
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,15 @@
|
||||
--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
|
||||
+++ ../comphelper/util/makefile.mk
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,15 @@
|
||||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/cmdmail/makefile.mk
|
||||
@@ -81,9 +81,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/proxysettings/makefile.mk
|
||||
@@ -85,9 +85,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/unix/exec/makefile.mk
|
||||
@@ -79,9 +79,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/cmdmail/makefile.mk
|
||||
@@ -81,9 +81,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/proxysettings/makefile.mk
|
||||
@@ -85,9 +85,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/unix/exec/makefile.mk
|
||||
@@ -79,9 +79,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/corereflection/makefile.mk
|
||||
@@ -87,9 +87,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/defaultregistry/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/implementationregistration/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/inspect/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation_adapterfactory/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javaloader/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPULIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javavm/makefile.mk
|
||||
@@ -91,10 +91,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(UNOLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(UNOLIB)
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL1STDLIBS += advapi32.lib
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/loader/makefile.mk
|
||||
@@ -83,9 +83,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/namingservice/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/proxy_factory/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB=i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/registry_tdprovider/makefile.mk
|
||||
@@ -88,10 +88,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(SALHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/servicemanager/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/tdmanager/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/typeconv/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/corereflection/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/corereflection/makefile.mk
|
||||
@@ -87,9 +87,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/defaultregistry/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/defaultregistry/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/implementationregistration/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/implementationregistration/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/inspect/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/inspect/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/invocation_adapterfactory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/invocation_adapterfactory/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javaloader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javaloader/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPULIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/javavm/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/javavm/makefile.mk
|
||||
@@ -91,10 +91,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(UNOLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(UNOLIB)
|
||||
|
||||
.IF "$(GUI)"=="WNT"
|
||||
SHL1STDLIBS += advapi32.lib
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/loader/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/loader/makefile.mk
|
||||
@@ -83,9 +83,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/namingservice/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/namingservice/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/proxy_factory/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/proxy_factory/makefile.mk
|
||||
@@ -85,9 +85,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB=i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/registry_tdprovider/makefile.mk.orig Tue Jan 1 14:12:02 2002
|
||||
+++ ../stoc/source/registry_tdprovider/makefile.mk
|
||||
@@ -88,10 +88,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(SALHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/servicemanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/servicemanager/makefile.mk
|
||||
@@ -84,9 +84,9 @@
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../stoc/source/tdmanager/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/tdmanager/makefile.mk
|
||||
@@ -83,9 +83,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
+
|
||||
SHL1VERSIONMAP=$(TARGET).map
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,14 @@
|
||||
--- ../stoc/source/typeconv/makefile.mk.orig Tue Jan 1 14:12:03 2002
|
||||
+++ ../stoc/source/typeconv/makefile.mk
|
||||
@@ -82,9 +82,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1VERSIONMAP= $(TARGET).map
|
@ -0,0 +1,13 @@
|
||||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
@ -0,0 +1,13 @@
|
||||
--- ../bridges/source/prot_uno/makefile.mk.orig Fri Oct 26 09:22:57 2001
|
||||
+++ ../bridges/source/prot_uno/makefile.mk Wed Mar 6 15:45:09 2002
|
||||
@@ -88,8 +88,8 @@
|
||||
SHL1VERSIONMAP=..$/bridge_exports.map
|
||||
|
||||
SHL1STDLIBS= \
|
||||
- $(CPPULIB) \
|
||||
- $(SALLIB)
|
||||
+ $(SALLIB) \
|
||||
+ $(CPPULIB)
|
||||
|
||||
DEF1NAME=$(SHL1TARGET)
|
||||
|
@ -0,0 +1,15 @@
|
||||
--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
|
||||
+++ ../comphelper/util/makefile.mk
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,15 @@
|
||||
--- ../comphelper/util/makefile.mk.orig Tue Jan 1 14:08:53 2002
|
||||
+++ ../comphelper/util/makefile.mk
|
||||
@@ -85,11 +85,11 @@
|
||||
|
||||
SHL1TARGET=$(COMPHLP_TARGET)$(COMPHLP_MAJOR)
|
||||
SHL1STDLIBS=\
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
$(VOSLIB) \
|
||||
$(OSLLIB) \
|
||||
- $(SALLIB) \
|
||||
$(CPPRTLLIB)
|
||||
|
||||
SHL1DEPN=
|
@ -0,0 +1,15 @@
|
||||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,15 @@
|
||||
--- ../eventattacher/source/makefile.mk.orig Tue Jan 1 14:09:28 2002
|
||||
+++ ../eventattacher/source/makefile.mk
|
||||
@@ -110,10 +110,10 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
$(CPPUHELPERLIB) \
|
||||
- $(VOSLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(VOSLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,14 @@
|
||||
--- ../javaunohelper/source/makefile.mk.orig Tue Jan 1 14:10:20 2002
|
||||
+++ ../javaunohelper/source/makefile.mk
|
||||
@@ -110,9 +110,9 @@
|
||||
SHL1TARGET= $(TARGET)
|
||||
|
||||
SHL1STDLIBS= \
|
||||
+ $(SALLIB) \
|
||||
$(CPPULIB) \
|
||||
- $(CPPUHELPERLIB) \
|
||||
- $(SALLIB)
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1DEPN=
|
||||
SHL1IMPLIB= i$(TARGET)
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/cmdmail/makefile.mk
|
||||
@@ -81,9 +81,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/proxysettings/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/proxysettings/makefile.mk
|
||||
@@ -85,9 +85,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/unix/exec/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/unix/exec/makefile.mk
|
||||
@@ -79,9 +79,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
@ -0,0 +1,16 @@
|
||||
--- ../shell/source/cmdmail/makefile.mk.orig Tue Jan 1 14:11:38 2002
|
||||
+++ ../shell/source/cmdmail/makefile.mk
|
||||
@@ -81,9 +81,10 @@
|
||||
|
||||
SHL1TARGET=$(TARGET)
|
||||
|
||||
-SHL1STDLIBS=$(CPPULIB)\
|
||||
- $(CPPUHELPERLIB)\
|
||||
- $(SALLIB)
|
||||
+SHL1STDLIBS=\
|
||||
+ $(SALLIB)\
|
||||
+ $(CPPULIB)\
|
||||
+ $(CPPUHELPERLIB)
|
||||
|
||||
SHL1LIBS=
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user