From: Jerome Benoit Date: Mon, 20 Mar 2017 16:11:08 +0000 (+0100) Subject: TP_13 exo2: More explicit name to the includes path variable X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;ds=inline;h=40b6c8898cf3565b8f12e04d2da5000136d2d6f8;p=TD_C.git TP_13 exo2: More explicit name to the includes path variable Signed-off-by: Jerome Benoit --- diff --git a/TP_13/exo2/Makefile b/TP_13/exo2/Makefile index 1a75ccf..ef4bea8 100644 --- a/TP_13/exo2/Makefile +++ b/TP_13/exo2/Makefile @@ -79,7 +79,7 @@ LDLIBS := $(filter-out -ltinfo,$(LDLIBS)) BINARY_SUFFIX := .exe DLIB_SUFFIX := .dll CYGWIN_LDLIBS_NOARCHIVE = -lncurses -CYGWIN_LIBLDFLAGS := -Wl,--out-implib=$(LIBRARY_PATH)/$(LIBRARY_NAME)$(DLIB_SUFFIX).a \ +CYGWIN_LIBLDFLAGS := -Wl,--out-implib=$(LIBRARY_PATH)/$(DLIB_PREFIX)$(LIBRARY_NAME)$(DLIB_SUFFIX).a \ -Wl,--export-all-symbols \ -Wl,--enable-auto-import endif @@ -93,9 +93,9 @@ ifeq ($(GOLD_SUPPORT),yes) LDFLAGS_GOLD = -fuse-ld=gold endif -# Putting header files in the source directory is not the purpose of this INCLUDES variable -INCLUDES := $(INCLUDES) -I$(LIBRARY_PATH) -CFLAGS := $(CFLAGS) $(CFLAGS_LTO) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG) $(INCLUDES) +# Putting header files in the source directory is not the purpose of this INCLUDES_PATH variable +INCLUDES_PATH := $(INCLUDES_PATH) -I$(LIBRARY_PATH) +CFLAGS := $(CFLAGS) $(CFLAGS_LTO) $(WARN_FLAGS) $(STD_FLAG) $(OPTI_FLAG) $(DEBUG_FLAG) $(INCLUDES_PATH) LIBCFLAGS := -fPIC $(CFLAGS) LDFLAGS := $(LDFLAGS) $(LDFLAGS_LTO) $(LDFLAGS_GOLD) $(STRIP_FLAG) LIBLDFLAGS := -shared $(LDFLAGS)