diff options
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/Makefile | 7 | ||||
| -rw-r--r-- | cpp/test/IceDiscovery/simple/Makefile | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile index 73b459f6f69..0e02cd9b376 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -51,8 +51,11 @@ SUBDIRS = proxy \ enums \ echo \ logger \ - networkProxy \ - services + networkProxy + +ifeq ($(findstring MINGW,$(UNAME)),) +SUBDIRS := $(SUBDIRS) services +endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/test/IceDiscovery/simple/Makefile b/cpp/test/IceDiscovery/simple/Makefile index aaa46cb42e6..ffff74f3bef 100644 --- a/cpp/test/IceDiscovery/simple/Makefile +++ b/cpp/test/IceDiscovery/simple/Makefile @@ -31,9 +31,15 @@ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(CPPFLAGS) +ifneq ($(findstring MINGW,$(UNAME)),) +ICEDISOVERY_LIBS = -licediscovery$(SOVERSION)$(COMPSUFFIX) +else +ICEDISOVERY_LIBS = -lIceDiscovery +endif + $(CLIENT): $(COBJS) rm -f $@ - $(call mktest,$@,$(COBJS), -lIceDiscovery $(LIBS)) + $(call mktest,$@,$(COBJS), $(ICEDISOVERY_LIBS) $(LIBS)) $(SERVER): $(SOBJS) rm -f $@ |