Use a variable for DLL MIME type.

[TD_C.git] / TP_13 / exo2 / Makefile

diff --git a/TP_13/exo2/Makefile b/TP_13/exo2/Makefile
index c4660a58ded2e21a20b3f01cc98e4db139de73e3..ddc9c7b8654e4660ef4cb7e6700242eba1d07e85 100644 (file)
--- a/TP_13/exo2/Makefile
+++ b/TP_13/exo2/Makefile
@@ -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
@@ -82,7 +82,7 @@ BINARY_SUFFIX := .exe
 DLIB_SUFFIX := .dll
 # do not archive external libraries
 CYGWIN_LDLIBS_NOARCHIVE := $(filter-out -l$(BINARY_NAME),$(LDLIBS))
-CYGWIN_LIBLDFLAGS := -Wl,--out-implib=$(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX).a \
+CYGWIN_LIBLDFLAGS := -Wl,--out-implib=$(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX)$(SLIB_SUFFIX) \
     -Wl,--export-all-symbols \
     -Wl,--enable-auto-import
 endif
@@ -124,8 +124,8 @@ $(LIBRARY_PATH)/$(SLIB_PREFIX)$(LIBRARY_NAME)$(SLIB_SUFFIX): $(LIBOBJS)
        @echo "[AR StO] $@"
        @$(AR) rcs $@ $^
 
-ifeq ($(filter-out CYGWIN_NT,$(UNAME)),CYGWIN_NT)
-$(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX).a: $(LIBRARY_PATH)/$(DLIB_PREFIX)$(CYGWIN_DLIBRARY_NAME)$(DLIB_SUFFIX)
+ifeq ($(findstring CYGWIN_NT,$(UNAME)),CYGWIN_NT)
+$(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX)$(SLIB_SUFFIX): $(LIBRARY_PATH)/$(DLIB_PREFIX)$(CYGWIN_DLIBRARY_NAME)$(DLIB_SUFFIX)
 $(LIBRARY_PATH)/$(DLIB_PREFIX)$(CYGWIN_DLIBRARY_NAME)$(DLIB_SUFFIX): $(LIBOBJS)
        @echo "[LD DLL] $@"
        @$(LD) $(LIBCFLAGS) $(LIBLDFLAGS) $(CYGWIN_LIBLDFLAGS) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(CYGWIN_LDLIBS_NOARCHIVE) -o $@
@@ -147,8 +147,8 @@ $(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)
-$(BINARY_NAME).dynamic$(BINARY_SUFFIX): $(OBJS) $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX).a
+ifeq ($(findstring CYGWIN_NT,$(UNAME)),CYGWIN_NT)
+$(BINARY_NAME).dynamic$(BINARY_SUFFIX): $(OBJS) $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX)$(SLIB_SUFFIX)
 else
 $(BINARY_NAME).dynamic$(BINARY_SUFFIX): $(OBJS) $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX)
 endif
@@ -179,12 +179,14 @@ clean:
        @echo "[CLN]"
        -@rm -r $(BUILDDIR)
        -@rm $(BINARY_NAME)$(BINARY_SUFFIX)
+ifneq ($(UNAME),Darwin)
        -@rm $(BINARY_NAME).static$(BINARY_SUFFIX)
+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
+       -@rm $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX)$(SLIB_SUFFIX)
 else
        -@rm $(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX)
 endif