changeset 122:9fb96c170bbc

Make build process less noisy and also work with parallel make.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 09 Mar 2016 13:56:20 +0200
parents a2c2c63311de
children e0880165f379
files Makefile Makefile.gen
diffstat 2 files changed, 29 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Mar 03 11:37:22 2016 +0200
+++ b/Makefile	Wed Mar 09 13:56:20 2016 +0200
@@ -10,11 +10,13 @@
 RANLIB ?= ranlib
 INSTALL ?= install
 
-CFLAGS += -DHAVE_STRING_H -DHAVE_STDINT_H -DHAVE_CONFIG_H=1 -I.
+CFLAGS += -DHAVE_CONFIG_H
 LDFLAGS +=
 
-#CFLAGS += -DHAVE_STDINT_H
+CFLAGS += -DHAVE_STRING_H
+CFLAGS += -DHAVE_STDINT_H
 #CFLAGS += -DHAVE_SYS_TYPES_H
+CFLAGS += -DHAVE_INTTYPES_H
 
 # Miscellaneous
 BINPATH=./
@@ -27,12 +29,14 @@
 ###
 ENDIANCHK_BIN=$(BINPATH)endianchk$(EXEEXT)
 NOINST_TARGETS += $(ENDIANCHK_BIN) config.h
+THLIBS_DEP += config.h
 
 include Makefile.gen
 
 
 $(ENDIANCHK_BIN): endianchk.c
-	$(CC) $(CFLAGS) -o $@ $+
+	@echo " CC $@"
+	@$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 config.h: $(ENDIANCHK_BIN)
 	$(ENDIANCHK_BIN) > $@
--- a/Makefile.gen	Thu Mar 03 11:37:22 2016 +0200
+++ b/Makefile.gen	Wed Mar 09 13:56:20 2016 +0200
@@ -1,7 +1,7 @@
-CFLAGS += -g -W -Wall -Wextra
+CFLAGS += -W -Wall -Wextra -std=c11 -pedantic -I./ -D_XOPEN_SOURCE=500
+CFLAGS += -g
 CFLAGS += -O2
-CFLAGS += -std=c11 -pedantic -D_XOPEN_SOURCE=500
-THLIBS=th-libs/
+THLIBS = th-libs/
 
 MKDIR ?= mkdir
 MKDIR_P ?= $(MKDIR) -p
@@ -26,28 +26,34 @@
 #
 all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS)
 
-$(OBJPATH):
-	$(MKDIR_P) $@
+$(THLIBS)th_string.c: $(addprefix $(THLIBS), th_printf1.c th_strmatch.c th_string.h)
+	touch $@
 
-$(BINPATH):
-	$(MKDIR_P) $@
+$(OBJPATH) $(BINPATH):
+	@echo " MKDIR $@"
+	@$(MKDIR_P) $@
 
-$(OBJPATH)%.o: $(THLIBS)%.c $(THLIBS)%.h
-	$(CC) $(CFLAGS) -c -o $@ $<
+$(OBJPATH)%.o: $(THLIBS)%.c $(THLIBS)%.h $(THLIBS_DEP)
+	@echo " CC $@ $+"
+	@$(CC) $(CFLAGS) -c -o $@ $<
 
-$(OBJPATH)%.o: %.c %.h
-	$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
+$(OBJPATH)%.o: %.c %.h $(THLIBS_DEP)
+	@echo " CC $@ $+"
+	@$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
 
-$(OBJPATH)%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
+$(OBJPATH)%.o: %.c $(THLIBS_DEP)
+	@echo " CC $@"
+	@$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
 
 
 $(THLIBS_A): $(addprefix $(OBJPATH),$(THLIBS_OBJ))
-	$(AR) cru $@ $(addprefix $(OBJPATH),$(THLIBS_OBJ))
-	$(RANLIB) $@
+	@echo " AR $@"
+	@$(AR) cru $@ $(addprefix $(OBJPATH),$(THLIBS_OBJ))
+	@$(RANLIB) $@
 
 $(SIDINFO_BIN): $(addprefix $(OBJPATH),$(SIDINFO_OBJ)) $(THLIBS_A) $(EXTRAOBJS)
-	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
+	@echo " LINK $@"
+	@$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 #
 # Special targets