diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:36:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 13:36:51 +0000 |
| commit | f317c08ca1a4cf55040d804ee148b67035cb107c (patch) | |
| tree | 80580d69f8d174cebba8de7c24db87dfcceebf08 /python | |
| parent | 62e5b8ce6b835897e18ee1c05f58f506200008ac (diff) | |
INTEGRATION: CWS mingwport03 (1.24.4); FILE MERGED
2007/03/19 19:02:15 vg 1.24.4.6: RESYNC: (1.27-1.29); FILE MERGED
2007/01/09 00:25:53 vg 1.24.4.5: RESYNC: (1.26-1.27); FILE MERGED
2006/11/09 16:58:34 vg 1.24.4.4: RESYNC: (1.24-1.26); FILE MERGED
2006/10/23 16:26:14 vg 1.24.4.3: #i53572# MinGW port
2006/09/26 11:15:29 vg 1.24.4.2: #i53572# MinGW port
2006/09/26 10:38:17 vg 1.24.4.1: #i53572# MinGW port
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index 1ee740c0082f..51625667d141 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.30 $ +# $Revision: 1.31 $ # -# last change: $Author: ihi $ $Date: 2007-03-26 12:23:31 $ +# last change: $Author: vg $ $Date: 2007-03-26 14:36:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -87,6 +87,8 @@ ADDITIONAL_FILES=$(foreach,i,$(ADDITIONAL_FILES_TMP) PCbuild/$(i).mak PCbuild/$( CONFIGURE_DIR= +ADDITIONAL_FILES+=Lib/plat-cygwin Python/fileblocks.c + .IF "$(GUI)"=="UNX" BUILD_DIR= MYCWD=$(shell pwd)/$(INPATH)/misc/build @@ -122,6 +124,16 @@ BUILD_ACTION=$(ENV_BUILD) $(GNUMAKE) -j$(EXTMAXPROCESS) ; $(GNUMAKE) install ; c # ---------------------------------- # WINDOWS # ---------------------------------- +.IF "$(COM)"=="GCC" +BUILD_DIR= +MYCWD=$(shell pwd)/$(INPATH)/misc/build +CC:=$(CC:s/guw.pl //) +CXX:=$(CXX:s/guw.pl //) +LDFLAGS:=-mno-cygwin +.EXPORT : LDFLAGS +CONFIGURE_ACTION= ./configure --prefix=$(MYCWD)/python-inst --enable-shared LN="cp -p" +BUILD_ACTION=$(ENV_BUILD) make ; make install +.ELSE PYTHONPATH:=..$/Lib .EXPORT : PYTHONPATH @@ -140,6 +152,7 @@ BUILD_ACTION= \ python.exe -c "import os" && \ echo build done .ENDIF +.ENDIF PYVERSIONFILE=$(MISC)$/pyversion.mk @@ -152,6 +165,7 @@ PYVERSIONFILE=$(MISC)$/pyversion.mk .IF "$(L10N_framework)"=="" .IF "$(GUI)" != "UNX" +.IF "$(COM)"!="GCC" PYCONFIG:=$(MISC)$/build$/pyconfig.h $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h : $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) @@ -161,6 +175,7 @@ $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h -rm -f $@ cat $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h > $@ .ENDIF +.ENDIF ALLTAR : $(PYVERSIONFILE) .ENDIF # "$(L10N_framework)"=="" |