summaryrefslogtreecommitdiff
path: root/padmin
diff options
context:
space:
mode:
authorhg <hg@oosvn01.>2009-10-08 15:46:11 +0000
committerhg <hg@oosvn01.>2009-10-08 15:46:11 +0000
commit3fb2edb5945be0a8ddc69759f1ec01029f5abe1a (patch)
treee7e79bc2c80d8a392f43712a3647ff99759fa4b8 /padmin
parent4eef171d081c2ebf0005798f1ae038fb2d899441 (diff)
parentb960e2fb193c459418180e67ebcc0eacf63e1c3c (diff)
merge with m50
Diffstat (limited to 'padmin')
-rw-r--r--padmin/prj/build.lst2
-rw-r--r--padmin/source/makefile.mk10
2 files changed, 4 insertions, 8 deletions
diff --git a/padmin/prj/build.lst b/padmin/prj/build.lst
index 765675d73137..9aaab83cf7de 100644
--- a/padmin/prj/build.lst
+++ b/padmin/prj/build.lst
@@ -1,3 +1,3 @@
-pd padmin : psprint vcl svtools NULL
+pd padmin : vcl svtools NULL
pd padmin usr1 - all pd_mkout NULL
pd padmin\source nmake - all pd_source NULL
diff --git a/padmin/source/makefile.mk b/padmin/source/makefile.mk
index 63c2c2e5a6e1..336631f1ceaa 100644
--- a/padmin/source/makefile.mk
+++ b/padmin/source/makefile.mk
@@ -85,8 +85,9 @@ SHL1STDLIBS=\
$(VCLLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPULIB) $(SALLIB)
+ $(COMPHELPERLIB) \
+ $(CPPULIB) \
+ $(SALLIB)
APP1TARGET=spadmin.bin
APP1DEPN+=$(SHL1TARGETN)
@@ -97,7 +98,6 @@ APP1OBJS=\
APP1STDLIBS= \
-l$(SHL1TARGET) \
- $(SVTOOLLIB) \
$(VCLLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
@@ -106,10 +106,6 @@ APP1STDLIBS= \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB) \
- $(I18NISOLANGLIB) $(ICUUCLIB) $(ICULELIB) $(ICUDATALIB)\
- $(TKLIB) $(SOTLIB) $(SVLLIB) $(I18NUTILLIB) $(VOSLIB) \
- $(BASEGFXLIB) $(JVMFWKLIB) $(SALHELPERLIB) \
- $(JVMACCESSLIB) \
-lXext -lX11
UNIXTEXT = $(MISC)$/spadmin.sh