summaryrefslogtreecommitdiff
path: root/cpp/demo/Manual/lifecycle
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2015-02-04 14:58:12 -0500
committerBernard Normier <bernard@zeroc.com>2015-02-04 14:58:12 -0500
commita6790dfe19bf2d22f388b6dba06dc83aa7c1a249 (patch)
tree021a8cc14eec71e29cf0b6786b318f7577d0bd29 /cpp/demo/Manual/lifecycle
parentRemoved IceGrid discovery plugin compilation from WinRT build (diff)
downloadice-a6790dfe19bf2d22f388b6dba06dc83aa7c1a249.tar.bz2
ice-a6790dfe19bf2d22f388b6dba06dc83aa7c1a249.tar.xz
ice-a6790dfe19bf2d22f388b6dba06dc83aa7c1a249.zip
Fixed ICE-5942: set BISON_FLEX=yes to compile scanner and grammar files with flex and bison
Diffstat (limited to 'cpp/demo/Manual/lifecycle')
-rw-r--r--cpp/demo/Manual/lifecycle/Makefile.mak20
1 files changed, 4 insertions, 16 deletions
diff --git a/cpp/demo/Manual/lifecycle/Makefile.mak b/cpp/demo/Manual/lifecycle/Makefile.mak
index a7ca4d97001..241ac59249b 100644
--- a/cpp/demo/Manual/lifecycle/Makefile.mak
+++ b/cpp/demo/Manual/lifecycle/Makefile.mak
@@ -20,11 +20,13 @@ TARGETS = $(CLIENT) $(SERVER)
SLICE_OBJS = .\Filesystem.obj
+BISON_FLEX_OBJS = .\Grammar.obj \
+ .\Scanner.obj
+
COBJS = $(SLICE_OBJS) \
.\Client.obj \
- .\Grammar.obj \
.\Parser.obj \
- .\Scanner.obj
+ $(BISON_FLEX_OBJS)
SOBJS = $(SLICE_OBJS) \
.\FilesystemI.obj \
@@ -52,19 +54,5 @@ $(SERVER): $(SOBJS)
@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
$(MT) -nologo -manifest $@.manifest -outputresource:$@;#1 && del /q $@.manifest
-Scanner.cpp: Scanner.l
- flex Scanner.l
- -del /q $@
- echo #include "IceUtil/ScannerConfig.h" >> Scanner.cpp
- type lex.yy.c >> Scanner.cpp
- -del /q lex.yy.c
-
-Grammar.cpp Grammar.h: Grammar.y
- -del /q Grammar.h Grammar.cpp
- bison -dvt Grammar.y
- move Grammar.tab.c Grammar.cpp
- move Grammar.tab.h Grammar.h
- -del /q Grammar.output
-
clean::
-del /q Filesystem.cpp Filesystem.h