Improve Makefile

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit 2fcace2fd9f9 · 2021-08-14T20:44:31.000+03:00
diff --git a/Makefile b/Makefile
@@ -1,41 +1,43 @@
-#DEPS = function.h
-#LIB_OBJS = function.o
+
+# Guide used while writing this makefile is
+# https://stackoverflow.com/questions/68428103/how-to-create-a-makefile-for-a-c-project-with-multiple-directories
+
 
 # https://stackoverflow.com/questions/18007326/how-to-change-default-values-of-variables-like-cc-in-makefile
 ifeq ($(origin CC),default) 
 	CC = gcc
 endif
 
-BLOB_STAMPER_OBJ = blobstamper/blob.o \
-blobstamper/helpers.o \
-blobstamper/stamp.o \
-blobstamper/stamp_arithm.o \
-blobstamper/stamp_dict.o \
-blobstamper/galley.o \
-blobstamper/dict.o \
+BLOBSTAMPER_SRC := $(wildcard  blobstamper/*.cpp)
+BLOBSTAMPER_OBJ := $(addsuffix .o, $(basename $(BLOBSTAMPER_SRC)))
 
-.PHONY: all blob-stamper-all blob-stamper-clean clean test
+.PHONY: all blob-stamper-all blob-stamper-clean clean test gagaga
 
-#all: blob-stamper-all test_dict $(WRAPPERS_OBJ)
-all: blob-stamper-all
+all: $(BLOBSTAMPER_OBJ)
 	@echo All done!
 
-blob-stamper-all:
-	$(MAKE) -C blobstamper
+blobstamper/%.o: blobstamper/%.cpp
+	$(CXX) -c -g $(CXXFLAGS) $< -o $@
+
+
+# blob-stamper-all:
+#	$(MAKE) -C blobstamper
+
+#%.o: %.cpp $(DEPS)
+#	$(CXX) -c -g $(CFLAGS) $<
+
+#%.o: %.c $(DEPS)
+#	$(CC) -c -g $(CXXFLAGS) $<
 
-%.o: %.cpp $(DEPS)
-	$(CXX) -c -g $(CFLAGS) $<
 
-%.o: %.c $(DEPS)
-	$(CC) -c -g $(CXXFLAGS) $<
 
 blob-stamper-clean:
+	rm -f *.o
+
+clean: blob-stamper-clean
 	$(MAKE) -C blobstamper clean
 	$(MAKE) -C t clean
 	$(MAKE) -C libtappp clean
-
-clean: blob-stamper-clean
-	rm -f *.o
 	@echo Clean done!
 
 test:
@@ -44,3 +46,10 @@ test:
 #test_dict: test_dict.o blob-stamper-all
 #	$(CXX) $(LDFLAGS) $@.o -o $@ $(BLOB_STAMPER_OBJ)
 
+
+gagaga:
+	@echo ------- $(BLOBSTAMPER_OBJ)
+
+#all: blob-stamper-all test_dict $(WRAPPERS_OBJ)
+#all: blob-stamper-all $(WRAPPERS_OBJ)
+#	@echo All done!
diff --git a/t/Makefile b/t/Makefile
@@ -6,38 +6,26 @@ DEBUG := -ggdb3 -DDEBUG
 #CXXFLAGS := $(DEBUG) $(WARNINGS) -fPIC
 PREFIX := /usr/local
 LIBRARY_VAR := LD_LIBRARY_PATH
-TEST_GOALS := ./00-sanity.t \
-./001-blob-generic.t \
-./050-sized_prt_and_vsato_ptr.t \
-./100-stamp-base.t \
-./110-stamp-arithm.t \
-./120-stamp_dict.t \
-./200-dict.t \
-./300-galley.t \
 
-all: build-libtappp $(TEST_GOALS)
 
+BLOBSTAMPER_SRC := $(wildcard  ../blobstamper/*.cpp)
+BLOBSTAMPER_OBJ := $(addsuffix .o, $(basename $(BLOBSTAMPER_SRC)))
 
-# FIXME this list dublicates same list in ../Makefile
-# should remove it for deduplication
-BLOB_STAMPER_OBJ = ../blobstamper/blob.o \
-../blobstamper/helpers.o \
-../blobstamper/dict.o \
-../blobstamper/stamp.o \
-../blobstamper/stamp_arithm.o \
-../blobstamper/stamp_dict.o \
-../blobstamper/galley.o \
+TEST_SRC := $(wildcard  ./*.cpp)
+TEST_BIN := $(addsuffix .t, $(basename $(TEST_SRC)))
 
 
+all: build-libtappp $(TEST_BIN)
+
 build-libtappp:
 	$(MAKE) -C ../libtappp
 
-%.t: %.cpp
-	$(CXX) $(CXXFLAGS) -I../libtappp/include -I.. -o $@ $< $(BLOB_STAMPER_OBJ)  -L../libtappp -ltap++
+%.t: %.cpp $(BLOBSTAMPER_OBJ)
+	$(CXX) $(CXXFLAGS) -I../libtappp/include -I.. -o $@ $< $(BLOBSTAMPER_OBJ)  -L../libtappp -ltap++
 
 test: all
-	@echo run_tests.pl $(TEST_GOALS)
-	@$(LIBRARY_VAR)=../libtappp ../libtappp/run_tests.pl $(TEST_GOALS)
+	@echo run_tests.pl $(TEST_BIN)
+	@$(LIBRARY_VAR)=../libtappp ../libtappp/run_tests.pl $(TEST_BIN)
 
 clean:
 	-rm *.t 2>/dev/null
