diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-03-03 19:00:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-03-03 19:00:15 +0000 |
| commit | e87c8c3327be1bbffc8a07f12e394ab7515df2b2 (patch) | |
| tree | 82f53d51311f658082a2702cc37fc37825f9dc81 /padmin | |
| parent | c7f6ac63231c6eb281f1d5679c384c43954edddd (diff) | |
INTEGRATION: CWS wmicons (1.14.16); FILE MERGED
2005/02/24 14:14:47 obr 1.14.16.1: #i37167# window manager icons now loaded from resource
Diffstat (limited to 'padmin')
| -rw-r--r-- | padmin/source/makefile.mk | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/padmin/source/makefile.mk b/padmin/source/makefile.mk index 9edccfcba43c..9b25293a20d9 100644 --- a/padmin/source/makefile.mk +++ b/padmin/source/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: rt $ $Date: 2004-10-29 12:45:30 $ +# last change: $Author: kz $ $Date: 2005-03-03 20:00:15 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -118,8 +118,7 @@ APP1TARGET=spadmin.bin APP1DEPN+=$(SHL1TARGETN) APP1OBJS=\ - $(OBJ)/pamain.obj \ - $(OBJ)/icon_resource_ooo.obj + $(OBJ)/pamain.obj APP1STDLIBS= \ -l$(SHL1TARGET) \ @@ -132,24 +131,6 @@ APP1STDLIBS= \ $(SALLIB) \ -lXext -lX11 -APP2TARGET=so$/spadmin.bin -APP2DEPN+=$(SHL1TARGETN) $(APP1TARGETN) - -APP2OBJS=\ - $(OBJ)/pamain.obj \ - $(OBJ)/icon_resource_sun.obj - -APP2STDLIBS= \ - -l$(SHL1TARGET) \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - -lXext -lX11 - .ENDIF all: $(BIN)$/so ALLTAR @@ -158,5 +139,3 @@ all: $(BIN)$/so ALLTAR .INCLUDE : target.mk -$(BIN)$/so: makefile.mk - @+-mkdir $(BIN)$/so >& $(NULLDEV) |