diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-04-06 11:37:09 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-04-06 11:37:09 -0230 |
| commit | c4b4c0da14f6d9aafbf52c0957af2adeed4f083e (patch) | |
| tree | 292a37eedb750f92a040b1bc04f31afd23655643 /csharp/test | |
| parent | Fixed Windows C# build (diff) | |
| download | ice-c4b4c0da14f6d9aafbf52c0957af2adeed4f083e.tar.bz2 ice-c4b4c0da14f6d9aafbf52c0957af2adeed4f083e.tar.xz ice-c4b4c0da14f6d9aafbf52c0957af2adeed4f083e.zip | |
ICE-6417 remove extraneous slice compiler directives
Diffstat (limited to 'csharp/test')
| -rw-r--r-- | csharp/test/Ice/seqMapping/Makefile | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/seqMapping/Makefile.mak | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/serialize/Makefile | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/serialize/Makefile.mak | 2 | ||||
| -rw-r--r-- | csharp/test/Slice/macros/Makefile | 2 | ||||
| -rw-r--r-- | csharp/test/Slice/macros/Makefile.mak | 2 | ||||
| -rw-r--r-- | csharp/test/Slice/structure/Makefile | 2 | ||||
| -rw-r--r-- | csharp/test/Slice/structure/Makefile.mak | 2 |
8 files changed, 2 insertions, 14 deletions
diff --git a/csharp/test/Ice/seqMapping/Makefile b/csharp/test/Ice/seqMapping/Makefile index cd7a393a2f1..212767c28b3 100644 --- a/csharp/test/Ice/seqMapping/Makefile +++ b/csharp/test/Ice/seqMapping/Makefile @@ -28,8 +28,6 @@ include $(top_srcdir)/config/Make.rules.cs MCSFLAGS := $(MCSFLAGS) -target:exe -SLICE2CSFLAGS := $(SLICE2CSFLAGS) --stream - client.exe: $(C_SRCS) $(GEN_SRCS) Serializable.dll $(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) -r:Serializable.dll $(C_SRCS) $(GEN_SRCS) diff --git a/csharp/test/Ice/seqMapping/Makefile.mak b/csharp/test/Ice/seqMapping/Makefile.mak index d4424707cdd..6c79117dc2b 100644 --- a/csharp/test/Ice/seqMapping/Makefile.mak +++ b/csharp/test/Ice/seqMapping/Makefile.mak @@ -27,8 +27,6 @@ GDIR = generated MCSFLAGS = $(MCSFLAGS) -target:exe -SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream - client.exe: $(C_SRCS) $(GEN_SRCS) Serializable.dll $(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" -r:Serializable.dll $(C_SRCS) $(GEN_SRCS) diff --git a/csharp/test/Ice/serialize/Makefile b/csharp/test/Ice/serialize/Makefile index e551aa10117..4867c3e00c3 100644 --- a/csharp/test/Ice/serialize/Makefile +++ b/csharp/test/Ice/serialize/Makefile @@ -23,7 +23,7 @@ include $(top_srcdir)/config/Make.rules.cs MCSFLAGS := $(MCSFLAGS) -target:exe -SLICE2CSFLAGS := $(SLICE2CSFLAGS) --stream -I. -I$(slicedir) +SLICE2CSFLAGS := $(SLICE2CSFLAGS) -I. -I$(slicedir) client.exe: $(C_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) $(C_SRCS) $(GEN_SRCS) diff --git a/csharp/test/Ice/serialize/Makefile.mak b/csharp/test/Ice/serialize/Makefile.mak index 4fb44da38ec..9ca44e07c4c 100644 --- a/csharp/test/Ice/serialize/Makefile.mak +++ b/csharp/test/Ice/serialize/Makefile.mak @@ -23,7 +23,7 @@ GDIR = generated MCSFLAGS = $(MCSFLAGS) -target:exe -SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream -I. -I"$(slicedir)" +SLICE2CSFLAGS = $(SLICE2CSFLAGS) -I. -I"$(slicedir)" !if "$(COMPACT)" == "yes" SLICE2CSFLAGS = $(SLICE2CSFLAGS) -DCOMPACT diff --git a/csharp/test/Slice/macros/Makefile b/csharp/test/Slice/macros/Makefile index dc9105024d0..77b23edb779 100644 --- a/csharp/test/Slice/macros/Makefile +++ b/csharp/test/Slice/macros/Makefile @@ -23,7 +23,5 @@ include $(top_srcdir)/config/Make.rules.cs MCSFLAGS := $(MCSFLAGS) -target:exe -SLICE2CSFLAGS := $(SLICE2CSFLAGS) --stream - client.exe: $(C_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) $(subst /,$(DSEP),$^) diff --git a/csharp/test/Slice/macros/Makefile.mak b/csharp/test/Slice/macros/Makefile.mak index da467e24b9c..fdc45a93119 100644 --- a/csharp/test/Slice/macros/Makefile.mak +++ b/csharp/test/Slice/macros/Makefile.mak @@ -23,7 +23,5 @@ GDIR = generated MCSFLAGS = $(MCSFLAGS) -target:exe -SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream - client.exe: $(C_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" $(C_SRCS) $(GEN_SRCS) diff --git a/csharp/test/Slice/structure/Makefile b/csharp/test/Slice/structure/Makefile index dc9105024d0..77b23edb779 100644 --- a/csharp/test/Slice/structure/Makefile +++ b/csharp/test/Slice/structure/Makefile @@ -23,7 +23,5 @@ include $(top_srcdir)/config/Make.rules.cs MCSFLAGS := $(MCSFLAGS) -target:exe -SLICE2CSFLAGS := $(SLICE2CSFLAGS) --stream - client.exe: $(C_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) $(subst /,$(DSEP),$^) diff --git a/csharp/test/Slice/structure/Makefile.mak b/csharp/test/Slice/structure/Makefile.mak index da467e24b9c..fdc45a93119 100644 --- a/csharp/test/Slice/structure/Makefile.mak +++ b/csharp/test/Slice/structure/Makefile.mak @@ -23,7 +23,5 @@ GDIR = generated MCSFLAGS = $(MCSFLAGS) -target:exe -SLICE2CSFLAGS = $(SLICE2CSFLAGS) --stream - client.exe: $(C_SRCS) $(GEN_SRCS) $(MCS) $(MCSFLAGS) -out:$@ -r:"$(refdir)\Ice.dll" $(C_SRCS) $(GEN_SRCS) |