summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-04-07 15:05:01 +0000
committerRelease Engineers <releng@openoffice.org>2009-04-07 15:05:01 +0000
commit82df5d9721ccfd0b0e65c5e4007dc7363d3ede5e (patch)
tree422b96c30208d465e03359c34c7749f382ce2448
parente0dd9a33da16867642462df9dfc08cb7b61c324f (diff)
#i10000# warning fix
-rw-r--r--desktop/util/makefile.mk73
1 files changed, 71 insertions, 2 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 4365c6d8fc..b04162cf0a 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -83,7 +83,42 @@ APP1TARGET=so$/$(TARGET)
APP1NOSAL=TRUE
APP1RPATH=BRAND
APP1OBJS=$(OBJ)$/copyright_ascii_sun.obj $(OBJ)$/main.obj
-APP1STDLIBS = $(SALLIB) $(SOFFICELIB)
+APP1STDLIBS = \
+ $(SALLIB) \
+ $(SOFFICELIB) \
+ $(COMPHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(I18NISOLANGLIB) \
+ $(SALLIB) \
+ $(SFXLIB) \
+ $(SVLLIB) \
+ $(SVTOOLLIB) \
+ $(TKLIB) \
+ $(TOOLSLIB) \
+ $(UCBHELPERLIB) \
+ $(UNOTOOLSLIB) \
+ $(VCLLIB) \
+ $(FWELIB) \
+ $(BASICLIB) \
+ $(XMLSCRIPTLIB) \
+ $(SALHELPERLIB) \
+ $(SOTLIB) \
+ $(SAXLIB) \
+ $(FWILIB) \
+ $(ICUUCLIB) \
+ $(SJLIB) \
+ $(I18NUTILLIB) \
+ $(ICULIB) \
+ $(JVMFWKLIB) \
+ $(BASEGFXLIB) \
+ $(ICUDATALIB) \
+ $(ICULELIB) \
+ $(JVMACCESSLIB) \
+ $(SALHELPERLIB) \
+ $(VOSLIB)
+
+
.IF "$(GUI)" == "UNX"
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
APP1STDLIBS+= -lXext -lSM -lICE
@@ -112,7 +147,41 @@ APP5TARGET=soffice
APP5NOSAL=TRUE
APP5RPATH=BRAND
APP5OBJS=$(OBJ)$/copyright_ascii_ooo.obj $(OBJ)$/main.obj
-APP5STDLIBS = $(SALLIB) $(SOFFICELIB)
+APP5STDLIBS = \
+ $(SALLIB) \
+ $(SOFFICELIB) \
+ $(COMPHELPERLIB) \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+ $(I18NISOLANGLIB) \
+ $(SALLIB) \
+ $(SFXLIB) \
+ $(SVLLIB) \
+ $(SVTOOLLIB) \
+ $(TKLIB) \
+ $(TOOLSLIB) \
+ $(UCBHELPERLIB) \
+ $(UNOTOOLSLIB) \
+ $(VCLLIB) \
+ $(FWELIB) \
+ $(BASICLIB) \
+ $(XMLSCRIPTLIB) \
+ $(SALHELPERLIB) \
+ $(SOTLIB) \
+ $(SAXLIB) \
+ $(FWILIB) \
+ $(ICUUCLIB) \
+ $(SJLIB) \
+ $(I18NUTILLIB) \
+ $(ICULIB) \
+ $(JVMFWKLIB) \
+ $(BASEGFXLIB) \
+ $(ICUDATALIB) \
+ $(ICULELIB) \
+ $(JVMACCESSLIB) \
+ $(SALHELPERLIB) \
+ $(VOSLIB)
+
.IF "$(OS)" == "LINUX"
APP5STDLIBS+= -lXext -lSM -lICE
.ENDIF # LINUX