TP_13: Fix the Cygwin support in the buildsystem
authorJerome Benoit <jerome.benoit@sap.com>
Sat, 3 Jun 2017 15:11:22 +0000 (17:11 +0200)
committerJerome Benoit <jerome.benoit@sap.com>
Sat, 3 Jun 2017 15:11:22 +0000 (17:11 +0200)
Signed-off-by: Jerome Benoit <jerome.benoit@sap.com>
TP_13/exo2/Makefile

index e77c61690d20a4b9ae0810feeb972de5beccd343..d3503c20d829bd3f494a994c8cb57a1ea3a94b64 100644 (file)
@@ -73,7 +73,7 @@ $(shell mkdir -p $(DEPDIR))
 DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$(notdir $*).Td
 POSTCOMPILE = mv -f $(DEPDIR)/$(notdir $*).Td $(DEPDIR)/$(notdir $*).d
 
-ifeq ($(filter-out CYGWIN_NT,$(UNAME)),CYGWIN_NT)
+ifeq ($(findstring CYGWIN_NT,$(UNAME)),CYGWIN_NT)
 CYGWIN_DLIBRARY_NAME := $(subst lib,cyg,$(LIBRARY_NAME))
 GOLD_SUPPORT = no
 # Cygwin ncurses do not contain tinfo
@@ -124,7 +124,7 @@ $(LIBRARY_PATH)/$(SLIB_PREFIX)$(LIBRARY_NAME)$(SLIB_SUFFIX): $(LIBOBJS)
        @echo "[AR StO] $@"
        @$(AR) rcs $@ $^
 
-ifeq ($(filter-out CYGWIN_NT,$(UNAME)),CYGWIN_NT)
+ifeq ($(findstring CYGWIN_NT,$(UNAME)),CYGWIN_NT)
 $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX).a: $(LIBRARY_PATH)/$(DLIB_PREFIX)$(CYGWIN_DLIBRARY_NAME)$(DLIB_SUFFIX)
 $(LIBRARY_PATH)/$(DLIB_PREFIX)$(CYGWIN_DLIBRARY_NAME)$(DLIB_SUFFIX): $(LIBOBJS)
        @echo "[LD DLL] $@"
@@ -147,7 +147,7 @@ $(BINARY_NAME).static$(BINARY_SUFFIX): $(OBJS) $(LIBRARY_PATH)/$(SLIB_PREFIX)$(L
        @echo "[LD ] $@"
        @$(LD) $(CFLAGS) $(STATICLIBLDFLAGS) $^ $(LDLIBS) -o $@
 
-ifeq ($(filter-out CYGWIN_NT,$(UNAME)),CYGWIN_NT)
+ifeq ($(findstring CYGWIN_NT,$(UNAME)),CYGWIN_NT)
 $(BINARY_NAME).dynamic$(BINARY_SUFFIX): $(OBJS) $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX).a
 else
 $(BINARY_NAME).dynamic$(BINARY_SUFFIX): $(OBJS) $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX)
@@ -184,7 +184,7 @@ ifneq ($(UNAME),Darwin)
 endif
        -@rm $(BINARY_NAME).dynamic$(BINARY_SUFFIX)
        -@rm $(LIBRARY_PATH)/$(SLIB_PREFIX)$(LIBRARY_NAME)$(SLIB_SUFFIX)
-ifeq ($(filter-out CYGWIN_NT,$(UNAME)),CYGWIN_NT)
+ifeq ($(findstring CYGWIN_NT,$(UNAME)),CYGWIN_NT)
        -@rm $(LIBRARY_PATH)/$(DLIB_PREFIX)$(CYGWIN_DLIBRARY_NAME)$(DLIB_SUFFIX)
        -@rm $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX).a
 else