diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-26 12:00:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-26 12:00:50 +0000 |
| commit | 0150a0525628426bf1f28d66735bbf620f79fe32 (patch) | |
| tree | d4fd9322d1080ba8e4a4b6e5deb2925c7a66fd06 /python | |
| parent | 5ad5c8cfcba0c783983a5ce597415de289854f45 (diff) | |
INTEGRATION: CWS merge20to201 (1.21.8); FILE MERGED
2005/09/23 10:14:58 hr 1.21.8.1: #i54997#: merge CWS vq20
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index 905e10406d9b..a208467510ad 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.21 $ +# $Revision: 1.22 $ # -# last change: $Author: rt $ $Date: 2005-09-08 16:49:39 $ +# last change: $Author: hr $ $Date: 2005-09-26 13:00:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -132,22 +132,26 @@ PYVERSIONFILE=$(MISC)$/pyversion.mk # --- Targets ------------------------------------------------------ -.IF "$(GUI)" != "UNX" -PYCONFIG=$(MISC)$/build$/pyconfig.h -.ENDIF .INCLUDE : set_ext.mk .INCLUDE : target.mk .INCLUDE : tg_ext.mk .IF "$(L10N_framework)"=="" -ALLTAR : $(PYCONFIG) $(PYVERSIONFILE) $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) -.ENDIF # "$(L10N_framework)"=="" +.IF "$(GUI)" != "UNX" +PYCONFIG:=$(MISC)$/build$/pyconfig.h +$(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h : $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) +$(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) : $(PYCONFIG) -$(MISC)$/build$/pyconfig.h : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h +$(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h -rm -f $@ cat $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h > $@ +.ENDIF + +ALLTAR : $(PYVERSIONFILE) +.ENDIF # "$(L10N_framework)"=="" + $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) -rm -f $@ |