diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 10:02:06 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-05-25 10:02:06 +0000 |
| commit | 11fdd5114124e44eeb0467fa9bc3a9a404d66120 (patch) | |
| tree | 9b9f9fa1042899bf36db777d79a88df7ea102b0a /pyuno | |
| parent | 23e02df17665eec968ca3c9257d1453a50d5fe29 (diff) | |
INTEGRATION: CWS mingwport04 (1.12.6); FILE MERGED
2007/04/18 09:32:49 vg 1.12.6.1: #i75844# MinGW port efforts part II
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/makefile.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk index e8b6760ad..eb2fa4281 100644 --- a/pyuno/source/loader/makefile.mk +++ b/pyuno/source/loader/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: vg $ $Date: 2007-03-26 15:59:47 $ +# last change: $Author: vg $ $Date: 2007-05-25 11:02:06 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -60,12 +60,6 @@ CFLAGS+=$(PYTHON_CFLAGS) CFLAGS+=-I$(SOLARINCDIR)$/python .ENDIF -.IF "$(GUI)" == "UNX" -PYUNOLIB=-lpyuno -.ELSE -PYUNOLIB=ipyuno.lib -.ENDIF - SHL1TARGET= $(TARGET) SHL1STDLIBS= \ @@ -126,7 +120,7 @@ $(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLL cd $(DLLDEST) && sh -c "export PATH='$(PATH):$(OUT)$/bin'; regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))" .ELSE cd $(DLLDEST) && regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i)) -.ENDIF "$(GUI)$(COM)"=="WNTGCC" +.ENDIF # "$(GUI)$(COM)"=="WNTGCC" .ENDIF # $(OS)=="MACOSX" cd $(DLLDEST) && mv pyuno_services.tmp pyuno_services.rdb |