diff options
| author | Hin-Tak Leung <hintak_leung@yahoo.co.uk> | 2010-01-22 17:51:45 +0000 |
|---|---|---|
| committer | Hin-Tak Leung <hintak_leung@yahoo.co.uk> | 2010-01-22 17:51:45 +0000 |
| commit | 2178101f26444bbdd8a1ca18e132c0a221aae6f4 (patch) | |
| tree | 3a44ad94aca4d33df67f1b5339cdeb8977c788de | |
| parent | 9edea5f8898d73e955181d7dc99dd0bd04905f96 (diff) | |
generate private copy of plver.h per language to allow parallel build, and remove reference to it in vcproj ; fixes bug 691061
git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@10632 a1074d23-0009-0410-80fe-cf8c14f379e6
| -rw-r--r-- | common/ugcc_top.mak | 1 | ||||
| -rw-r--r-- | pl/pl.mak | 22 | ||||
| -rwxr-xr-x | win32/pcl.vcproj | 4 |
3 files changed, 11 insertions, 16 deletions
diff --git a/common/ugcc_top.mak b/common/ugcc_top.mak index e11383dc3..bc6e0aa02 100644 --- a/common/ugcc_top.mak +++ b/common/ugcc_top.mak @@ -82,7 +82,6 @@ pdl-clean: $(RMN_) $(ECHOGS_XE) $(RMN_) $(GENCONF_XE) $(RMN_) $(TARGET_XE)$(XE) - $(RMN_) $(PLSRCDIR)/plver.h # Build the configuration file. @@ -63,17 +63,17 @@ PJLVERSION="8.71 (unreleased snapshot)" PJL_VOLUME_0=/tmp/pjl0 PJL_VOLUME_1=/tmp/pjl1 -plver_h=$(PLSRC)plver.h - -$(PLSRC)plver.h: $(PLSRC)pl.mak - $(GLGEN)echogs$(XE) -e .h -w $(PLSRC)plver -n -x 23 "define PJLVERSION" - $(GLGEN)echogs$(XE) -e .h -a $(PLSRC)plver -s -x 22 $(PJLVERSION) -x 22 - $(GLGEN)echogs$(XE) -e .h -a $(PLSRC)plver -n -x 23 "define PJLBUILDDATE" - $(GLGEN)echogs$(XE) -e .h -a $(PLSRC)plver -s -x 22 -d -x 22 - $(GLGEN)echogs$(XE) -e .h -a $(PLSRC)plver -n -x 23 "define PJL_VOLUME_0" - $(GLGEN)echogs$(XE) -e .h -a $(PLSRC)plver -s -x 22 $(PJL_VOLUME_0) -x 22 - $(GLGEN)echogs$(XE) -e .h -a $(PLSRC)plver -n -x 23 "define PJL_VOLUME_1" - $(GLGEN)echogs$(XE) -e .h -a $(PLSRC)plver -s -x 22 $(PJL_VOLUME_1) -x 22 +plver_h=$(PLOBJ)plver.h + +$(PLOBJ)plver.h: $(PLSRC)pl.mak + $(GLGEN)echogs$(XE) -e .h -w $(PLOBJ)plver -n -x 23 "define PJLVERSION" + $(GLGEN)echogs$(XE) -e .h -a $(PLOBJ)plver -s -x 22 $(PJLVERSION) -x 22 + $(GLGEN)echogs$(XE) -e .h -a $(PLOBJ)plver -n -x 23 "define PJLBUILDDATE" + $(GLGEN)echogs$(XE) -e .h -a $(PLOBJ)plver -s -x 22 -d -x 22 + $(GLGEN)echogs$(XE) -e .h -a $(PLOBJ)plver -n -x 23 "define PJL_VOLUME_0" + $(GLGEN)echogs$(XE) -e .h -a $(PLOBJ)plver -s -x 22 $(PJL_VOLUME_0) -x 22 + $(GLGEN)echogs$(XE) -e .h -a $(PLOBJ)plver -n -x 23 "define PJL_VOLUME_1" + $(GLGEN)echogs$(XE) -e .h -a $(PLOBJ)plver -s -x 22 $(PJL_VOLUME_1) -x 22 pjparse_h=$(PLSRC)pjparse.h pjtop_h=$(PLSRC)pjtop.h $(pltop_h) diff --git a/win32/pcl.vcproj b/win32/pcl.vcproj index 13ac3dffc..20c7ee39d 100755 --- a/win32/pcl.vcproj +++ b/win32/pcl.vcproj @@ -635,10 +635,6 @@ >
</File>
<File
- RelativePath="..\pl\plver.h"
- >
- </File>
- <File
RelativePath="..\pl\plvocab.c"
>
</File>
|