ithewei 7 rokov pred
rodič
commit
b94dc120bd
1 zmenil súbory, kde vykonal 14 pridanie a 15 odobranie
  1. 14 15
      Makefile

+ 14 - 15
Makefile

@@ -3,7 +3,6 @@ CXX = g++
 MKDIR = mkdir -p
 RM = rm -r
 
-CPPFLAGS +=
 CFLAGS += -g -Wall -O3 
 CXXFLAGS += $(CFLAGS) -std=c++11
 
@@ -18,9 +17,18 @@ ifeq ($(OS),Windows_NT)
 TARGET := $(addsuffix .exe, $(TARGET))
 endif
 
-INCDIRS  += . $(INCDIR) $(DEPDIR)/include
-INCFLAGS += $(addprefix -I, $(INCDIRS))
-CPPFLAGS += $(INCFLAGS)
+DIRS += . $(SRCDIR) test
+SRCS += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c $(dir)/*.cc $(dir)/*.cpp))
+#OBJS := $(patsubst %.cpp, %.o, $(SRCS))
+OBJS := $(addsuffix .o, $(basename $(SRCS)))
+
+$(info TARGET=$(TARGET))
+$(info DIRS=$(DIRS))
+$(info SRCS=$(SRCS))
+$(info OBJS=$(OBJS))
+
+INCDIRS  += $(INCDIR) $(DEPDIR)/include $(DIRS)
+CPPFLAGS += $(addprefix -I, $(INCDIRS))
 
 LIBDIRS += $(LIBDIR) $(DEPDIR)/lib
 LDFLAGS += $(addprefix -L, $(LIBDIRS))
@@ -28,20 +36,11 @@ LDFLAGS += -lpthread
 
 $(info CC=$(CC))
 $(info CXX=$(CXX))
-$(info CPPFLAGS=$(CPPFLAGS))
 $(info CFLAGS=$(CFLAGS))
 $(info CXXFLAGS=$(CXXFLAGS))
+$(info CPPFLAGS=$(CPPFLAGS))
 $(info LDFLAGS=$(LDFLAGS))
 
-DIRS += . $(SRCDIR) test
-SRCS += $(foreach dir, $(DIRS), $(wildcard $(dir)/*.c $(dir)/*.cc $(dir)/*.cpp))
-#OBJS := $(patsubst %.cpp, %.o, $(SRCS))
-OBJS := $(addsuffix .o, $(basename $(SRCS)))
-
-$(info DIRS=$(DIRS))
-$(info SRCS=$(SRCS))
-$(info OBJS=$(OBJS))
-
 default: all
 
 all: prepare $(TARGET)
@@ -60,4 +59,4 @@ install:
 
 uninstall:
     
-.PHONY: default all prepare clean install uninstall
+.PHONY: default all prepare clean install uninstall