FindQuery

1 files changed, 13 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 381b573..acef217 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,23 @@
-CC=gcc
-CXX=g++
-CFLAGS=-Wall -O2
-CPPFLAGS=-Wall -O2 -std=c++11
+CXXFLAGS = -Wall -O2 -std=c++11
+CXX = g++
 
-BINARIES=engine
-OBJS=enginedata.o util.o
-DEPFILES=$(OBJS:.o=.d)
+BINARIES = engine
+CXX_FILES = $(shell echo *.cpp)
+H_FILES = *.h
+OBJ_FILES = $(CXX_FILES:.cpp=.o)
 
-
-.PHONY: all clean
+.PHONY: all clean remake
 
 all: $(BINARIES)
 
 clean:
-	rm -f $(BINARIES) $(OBJS) $(DEPFILES)
-
-
--include $(OBJS:.o=.d)
-
+	rm -f $(BINARIES) $(OBJ_FILES)
 
-engine: engine.cpp enginedata.o util.o
-	$(CXX) $(CPPFLAGS) -o $@ $^
+remake: clean all
 
-enginedata: enginedata.cpp enginedata.h util.o
-	$(CXX) $(CPPFLAGS) -o %@ enginedata.cpp
+engine: $(OBJ_FILES)
+	$(CXX) $(CXXFLAGS) -o $@ $(OBJ_FILES)
+	strip $@
 
 %.o: %.cpp %.h
-	$(CXX) $(CPPFLAGS) $*.cpp -c -o $*.o
-	$(CXX) -MM $(CPPFLAGS) $*.cpp > $*.d
+	$(CXX) $(CXXFLAGS) -c -o $*.o $*.cpp