diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-26 02:10:27 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-26 02:10:27 +0000 |
| commit | 2f0055984c1e982cc232390c673faf02488bbdaf (patch) | |
| tree | 6557256cdfff31f8e0cee7fe0883e1ed9eee3500 /crashrep | |
| parent | 0da12df7d6dcd877899d6e07e1c210e19ee7b3d1 (diff) | |
INTEGRATION: CWS mergebuild (1.9.2); FILE MERGED
2004/06/14 11:01:32 hjs 1.9.2.3: #i8252# adopt to merge on the fly
2004/04/20 16:36:30 hjs 1.9.2.2: RESYNC: (1.9-1.10); FILE MERGED
2003/10/29 17:19:37 hjs 1.9.2.1: #i8252# telnr. to iso code; switch to ulf
Diffstat (limited to 'crashrep')
| -rwxr-xr-x | crashrep/source/unx/makefile.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk index 9baee34ee2ba..dcd38443fb1f 100755 --- a/crashrep/source/unx/makefile.mk +++ b/crashrep/source/unx/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: vg $ $Date: 2003-12-17 19:28:12 $ +# last change: $Author: hjs $ $Date: 2004-06-26 03:10:27 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -122,7 +122,7 @@ APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $( .ENDIF # Building crash_report_static -ALL: ALLTAR $(BIN)$/crash_dump.res.01 +CRASH_RES=$(foreach,i,$(alllangiso) $(BIN)$/crash_dump.res.$i) .ENDIF # "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == "" @@ -132,9 +132,13 @@ ALL: ALLTAR $(BIN)$/crash_dump.res.01 .INCLUDE : target.mk +ALLTAR : $(CRASH_RES) + $(OBJ)$/main.obj: $(INCCOM)$/_version.h -$(BIN)$/crash_dump.res.01: ..$/all$/crashrep.lng - $(BIN)$/unxcrashres ..$/all$/crashrep.lng $(BIN)$/crash_dump.res +.IF "$(CRASH_RES)"!="" +$(CRASH_RES) .UPDATEALL : $(COMMONMISC)$/crash_res$/crashrep.ulf + $(BIN)$/unxcrashres $(COMMONMISC)$/crash_res$/crashrep.ulf $(BIN)$/crash_dump.res +.ENDIF # "$(CRASH_RES)"!="" # Building crash_report |