From 8cf2c1d2d7914be388abf9d799fc23ea13e605c8 Mon Sep 17 00:00:00 2001 From: Vemake Date: Tue, 23 Jul 2019 12:14:11 +0800 Subject: [PATCH 1/3] Fix 12 dependency issues in Makefile --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index fd3460b..60bb361 100644 --- a/Makefile +++ b/Makefile @@ -25,28 +25,28 @@ check: test-file test-static test-dynamic ./$(DIST)/test-static LD_LIBRARY_PATH=$(DIST) ./$(DIST)/test-dynamic -test-file: $(DIST) $(TESTS) $(PROJ).c - $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) $(PROJ).c -lm -o $(DIST)/test-file +test-file: $(DIST) $(TESTS) $(PROJ).c mpc.h tests/ptest.h + $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) $(PROJ).c -lm -o $(DIST)/test-file -test-dynamic: $(DIST) $(TESTS) lib$(PROJ).so - $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -o $(DIST)/test-dynamic +test-dynamic: $(DIST) $(TESTS) lib$(PROJ).so mpc.h tests/ptest.h + $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -o $(DIST)/test-dynamic -test-static: $(DIST) $(TESTS) lib$(PROJ).a - $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -static -o $(DIST)/test-static +test-static: $(DIST) $(TESTS) lib$(PROJ).a mpc.h tests/ptest.h + $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -static -o $(DIST)/test-static -examples/%: $(DIST) examples/%.c $(PROJ).c - $(CC) $(CFLAGS) $(filter-out $(DIST), $^) -lm -o $(DIST)/$@ +examples/%: $(DIST) examples/%.c $(PROJ).c mpc.h + $(CC) $(CFLAGS) $(filter-out $(DIST), $^) -lm -o $(DIST)/$@ -lib$(PROJ).so: $(DIST) $(PROJ).c +lib$(PROJ).so: $(DIST) $(PROJ).c mpc.h ifneq ($(OS),Windows_NT) - $(CC) $(CFLAGS) -fPIC -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so + $(CC) $(CFLAGS) -fPIC -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so else - $(CC) $(CFLAGS) -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so + $(CC) $(CFLAGS) -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so endif -lib$(PROJ).a: $(DIST) $(PROJ).c - $(CC) $(CFLAGS) -c $(PROJ).c -o $(DIST)/$(PROJ).o - $(AR) rcs $(DIST)/lib$(PROJ).a $(DIST)/$(PROJ).o +lib$(PROJ).a: $(DIST) $(PROJ).c mpc.h + $(CC) $(CFLAGS) -c $(PROJ).c -o $(DIST)/$(PROJ).o + $(AR) rcs $(DIST)/lib$(PROJ).a $(DIST)/$(PROJ).o libs: lib$(PROJ).so lib$(PROJ).a From 217a551a0a3dac094a83014bf29680f749ca99f3 Mon Sep 17 00:00:00 2001 From: Vemake Date: Wed, 7 Aug 2019 17:55:12 +0800 Subject: [PATCH 2/3] Use tabs instead of spaces in Makefile. --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 60bb361..a0972c5 100644 --- a/Makefile +++ b/Makefile @@ -26,27 +26,27 @@ check: test-file test-static test-dynamic LD_LIBRARY_PATH=$(DIST) ./$(DIST)/test-dynamic test-file: $(DIST) $(TESTS) $(PROJ).c mpc.h tests/ptest.h - $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) $(PROJ).c -lm -o $(DIST)/test-file + $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) $(PROJ).c -lm -o $(DIST)/test-file test-dynamic: $(DIST) $(TESTS) lib$(PROJ).so mpc.h tests/ptest.h - $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -o $(DIST)/test-dynamic + $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -o $(DIST)/test-dynamic test-static: $(DIST) $(TESTS) lib$(PROJ).a mpc.h tests/ptest.h - $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -static -o $(DIST)/test-static + $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -static -o $(DIST)/test-static examples/%: $(DIST) examples/%.c $(PROJ).c mpc.h - $(CC) $(CFLAGS) $(filter-out $(DIST), $^) -lm -o $(DIST)/$@ + $(CC) $(CFLAGS) $(filter-out $(DIST), $^) -lm -o $(DIST)/$@ lib$(PROJ).so: $(DIST) $(PROJ).c mpc.h ifneq ($(OS),Windows_NT) - $(CC) $(CFLAGS) -fPIC -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so + $(CC) $(CFLAGS) -fPIC -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so else - $(CC) $(CFLAGS) -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so + $(CC) $(CFLAGS) -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so endif lib$(PROJ).a: $(DIST) $(PROJ).c mpc.h - $(CC) $(CFLAGS) -c $(PROJ).c -o $(DIST)/$(PROJ).o - $(AR) rcs $(DIST)/lib$(PROJ).a $(DIST)/$(PROJ).o + $(CC) $(CFLAGS) -c $(PROJ).c -o $(DIST)/$(PROJ).o + $(AR) rcs $(DIST)/lib$(PROJ).a $(DIST)/$(PROJ).o libs: lib$(PROJ).so lib$(PROJ).a From 7812a337741acd01e436f59eef4c52b5b93abd34 Mon Sep 17 00:00:00 2001 From: vemakereporter Date: Wed, 7 Aug 2019 10:15:39 +0000 Subject: [PATCH 3/3] Fix dependency issues reported by Vemake --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a0972c5..f60b65c 100644 --- a/Makefile +++ b/Makefile @@ -20,35 +20,35 @@ all: $(EXAMPLESEXE) check $(DIST): $(MKDIR) $(DIST)/examples -check: test-file test-static test-dynamic +check: $(DIST)/test-file $(DIST)/test-static $(DIST)/test-dynamic ./$(DIST)/test-file ./$(DIST)/test-static LD_LIBRARY_PATH=$(DIST) ./$(DIST)/test-dynamic -test-file: $(DIST) $(TESTS) $(PROJ).c mpc.h tests/ptest.h +$(DIST)/test-file: $(TESTS) $(PROJ).c mpc.h tests/ptest.h $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) $(PROJ).c -lm -o $(DIST)/test-file -test-dynamic: $(DIST) $(TESTS) lib$(PROJ).so mpc.h tests/ptest.h +$(DIST)/test-dynamic: $(TESTS) $(DIST)/lib$(PROJ).so mpc.h tests/ptest.h $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -o $(DIST)/test-dynamic -test-static: $(DIST) $(TESTS) lib$(PROJ).a mpc.h tests/ptest.h +$(DIST)/test-static: $(TESTS) $(DIST)/lib$(PROJ).a mpc.h tests/ptest.h $(CC) $(filter-out -Werror, $(CFLAGS)) $(TESTS) -lm -L$(DIST) -l$(PROJ) -static -o $(DIST)/test-static examples/%: $(DIST) examples/%.c $(PROJ).c mpc.h $(CC) $(CFLAGS) $(filter-out $(DIST), $^) -lm -o $(DIST)/$@ -lib$(PROJ).so: $(DIST) $(PROJ).c mpc.h +$(DIST)/lib$(PROJ).so: $(PROJ).c mpc.h ifneq ($(OS),Windows_NT) $(CC) $(CFLAGS) -fPIC -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so else $(CC) $(CFLAGS) -shared $(PROJ).c -o $(DIST)/lib$(PROJ).so endif -lib$(PROJ).a: $(DIST) $(PROJ).c mpc.h +$(DIST)/lib$(PROJ).a: $(PROJ).c mpc.h $(CC) $(CFLAGS) -c $(PROJ).c -o $(DIST)/$(PROJ).o $(AR) rcs $(DIST)/lib$(PROJ).a $(DIST)/$(PROJ).o -libs: lib$(PROJ).so lib$(PROJ).a +libs: $(DIST)/lib$(PROJ).so $(DIST)/lib$(PROJ).a clean: rm -rf -- $(DIST)