From 9e9a962e2f115d0df0599cb84bdbc5009ea7de12 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Wed, 12 Jul 2017 13:17:54 +0200
Subject: Small improvements to the makefile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 Makefile | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 749f41c..8c5bc2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 CONFIGFILE = config.mk
 include $(CONFIGFILE)
 
+
 BIN =\
 	blind-apply-palette\
 	blind-arithm\
@@ -90,10 +91,9 @@ SCRIPTS =\
 	blind-rotate-180\
 	blind-rotate-270
 
-MAN1 = $(BIN:=.1) $(SCRIPTS:=.1)
-MAN7 = blind.7
-
-SRC = $(BIN:=.c) util.c stream.c
+COMMON_OBJ =\
+	util.o\
+	stream.o
 
 HDR =\
 	arg.h\
@@ -113,7 +113,12 @@ HDR =\
 	util/fshut.h\
 	video-math.h
 
-MISCFILES = Makefile config.mk LICENSE README TODO
+MISCFILES =\
+	Makefile\
+	config.mk\
+	LICENSE\
+	README\
+	TODO
 
 EXAMPLEDIRS =\
 	inplace-flop\
@@ -125,10 +130,16 @@ EXAMPLEFILES =\
 	reverse/Makefile\
 	split/Makefile
 
+COMMON_SRC = $(COMMON_SRC:.o=.c)
+SRC = $(BIN:=.c) $(COMMON_SRC)
+MAN1 = $(BIN:=.1) $(SCRIPTS:=.1)
+MAN7 = blind.7
+
+
 all: $(BIN)
 
-%: %.o util.o stream.o
-	$(CC) $(LDFLAGS) -o $@ $^
+%: %.o $(COMMON_OBJ)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
 %.o: src/%.c src/*.h src/*/*.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
@@ -174,5 +185,6 @@ clean:
 	-rm -f $(BIN) *.o blind-$(VERSION).tar.gz
 	-rm -rf "blind-$(VERSION)"
 
+
 .PHONY: all install uninstall dist clean
-.PRECIOUS: util.o stream.o
+.PRECIOUS: $(COMMON_OBJ)
-- 
cgit v1.2.3-70-g09d2