diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-08-25 15:16:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-08-25 15:16:04 +0000 |
| commit | 348d31df30762b3ae2609fed2eff555c05645ceb (patch) | |
| tree | 7899cf5e8e146f4241cdfca5bbfad8872424ec49 /vcl | |
| parent | dddd126691980d0b831219e2c20c9d6d10af647f (diff) | |
INTEGRATION: CWS gslpatches4 (1.69.42); FILE MERGED
2005/07/19 15:06:52 pl 1.69.42.4: #i51735# link to dl lib also when NAS is disabled
2005/07/19 12:38:12 pl 1.69.42.3: RESYNC: (1.69-1.70); FILE MERGED
2005/07/11 10:43:48 pl 1.69.42.2: #i51735# make NAS optional
2005/07/11 09:33:20 pl 1.69.42.1: #i51748# dependency
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/util/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 1d2457d8a7bd..936d8abea175 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.72 $ +# $Revision: 1.73 $ # -# last change: $Author: kz $ $Date: 2005-08-25 15:38:18 $ +# last change: $Author: kz $ $Date: 2005-08-25 16:16:04 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -327,13 +327,13 @@ SHL2STDLIBS += -framework CoreAudio -framework AudioToolbox SHL2STDLIBS += -lsndfile -lportaudio .ENDIF # ENABLE_PASF -.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" +.IF "$(ENABLE_NAS)" != "" SHL2STDLIBS += -laudio .IF "$(OS)"=="SOLARIS" # needed by libaudio.a SHL2STDLIBS += -ldl -lnsl -lsocket .ENDIF # SOLARIS -.ENDIF # "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" +.ENDIF .IF "$(GUIBASE)"=="unx" @@ -342,6 +342,10 @@ SHL2STDLIBS+=$(LIBSN_LIBS) .ENDIF SHL2STDLIBS += -lXext -lSM -lICE -lX11 +.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" +# needed by salprnpsp.cxx +SHL2STDLIBS+= -ldl +.ENDIF .ENDIF # "$(GUIBASE)"=="unx" @@ -410,6 +414,7 @@ LIB5FILES=$(SLB)$/kdeplug.lib SHL5TARGET=vclplug_kde$(UPD)$(DLLPOSTFIX) SHL5IMPLIB=ikde_plug_ SHL5LIBS=$(LIB5TARGET) +SHL5DEPN=$(SHL2TARGETN) # libs for KDE plugin SHL5STDLIBS=$(KDE_LIBS) SHL5STDLIBS+=-l$(SHL2TARGET) |