TP_13 exo2: More explicit name to the includes path variable

Signed-off-by: Jerome Benoit <jerome.benoit@sap.com>

diff --git a/TP_13/exo2/Makefile b/TP_13/exo2/Makefile
index 1a75ccfd150056e9d835ffd364d94ee12c2d7186..ef4bea820c001b420090747984e25060341ed981 100644 (file)
--- 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
 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
     -Wl,--export-all-symbols \
     -Wl,--enable-auto-import
 endif


@@ -93,9 +93,9 @@ ifeq ($(GOLD_SUPPORT),yes)
 LDFLAGS_GOLD = -fuse-ld=gold
 endif
 
 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)
 LIBCFLAGS := -fPIC $(CFLAGS)
 LDFLAGS := $(LDFLAGS) $(LDFLAGS_LTO) $(LDFLAGS_GOLD) $(STRIP_FLAG)
 LIBLDFLAGS := -shared $(LDFLAGS)