From 5eb4d1a2c7fc238a51ee8afd0f1bc71d00c675ae Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 17 Oct 2019 16:01:41 -0400 Subject: [PATCH] build: Minor improvements to makefile. (alphabetize the backend names, and beter dependencies for sinfonia code) --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a9b8ea6..235b4f6 100644 --- a/Makefile +++ b/Makefile @@ -58,18 +58,22 @@ CPPFLAGS += -DURI_PREFIX=\"$(BACKEND_NAME)\" $(OLD_URI) CFLAGS += -funit-at-a-time # List of backends -BACKENDS = sonyupd sonyupdneo kodak6800 kodak1400 shinkos2145 shinkos1245 canonselphy mitsu70x kodak605 dnpds40 mitsu9550 shinkos6245 shinkos6145 canonselphyneo mitsup95d magicard mitsud90 hiti +BACKENDS = canonselphy canonselphyneo dnpds40 hiti kodak605 kodak1400 kodak6800 magicard mitsu70x mitsu9550 mitsud90 mitsup95d shinkos1245 shinkos2145 shinkos6145 shinkos6245 sonyupd sonyupdneo -# For the s6145 and mitsu70x backends +# For the s6145, mitsu70x, and mitsu9550 backends CPPFLAGS += -DUSE_DLOPEN LDFLAGS += -ldl #CPPFLAGS += -DUSE_LTDL #LDFLAGS += -lltdl # Build stuff -DEPS += backend_common.h backend_sinfonia.h +DEPS += backend_common.h SOURCES = backend_common.c backend_sinfonia.c $(addsuffix .c,$(addprefix backend_,$(BACKENDS))) +# Dependencies for sinfonia backends.. +SINFONIA_BACKENDS = sinfonia kodak605 kodak6800 shinkos1245 shinkos2145 shinkos6145 shinkos6245 +SINFONIA_BACKENDS_O = $(addsuffix .o,$(addprefix backend_,$(SINFONIA_BACKENDS))) + # And now the rules! .PHONY: clean all install cppcheck @@ -121,6 +125,7 @@ release: clean $(RM) -Rf selphy_print$(REVISION) # Backend-specific joy: +$(SINFONIA_BACKENDS_O): backend_sinfonia.h backend_mitsu70x.o: CPPFLAGS += -DCORRTABLE_PATH=\"$(BACKEND_DATA_DIR)\" -include lib70x/libMitsuD70ImageReProcess.h backend_mitsu9550.o: CPPFLAGS += -DCORRTABLE_PATH=\"$(BACKEND_DATA_DIR)\" -include lib70x/libMitsuD70ImageReProcess.h backend_hiti.o: CPPFLAGS += -DCORRTABLE_PATH=\"$(BACKEND_DATA_DIR)\"