diff Makefile.gen @ 671:dd3083a3383d

Use the makefile.inc helper from th-libs for generic targets.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 09 Mar 2016 15:09:59 +0200
parents 32c13602c091
children 650e7a5c74c5
line wrap: on
line diff
--- a/Makefile.gen	Tue Mar 01 17:21:52 2016 +0200
+++ b/Makefile.gen	Wed Mar 09 15:09:59 2016 +0200
@@ -6,8 +6,6 @@
 CFLAGS += -std=c11 -pedantic -D_XOPEN_SOURCE=500
 THLIBS=th-libs/
 
-MKDIR ?= mkdir
-MKDIR_P ?= $(MKDIR) -p
 
 #
 # Version strings
@@ -27,38 +25,17 @@
 NNCHAT_BIN=$(BINPATH)nnchat$(EXEEXT)
 
 TARGETS += $(NNCHAT_BIN)
-NOBUILD_TARGETS += $(OBJPATH) $(BINPATH)
-NOINST_TARGETS += $(THLIBS_A)
 
+include $(THLIBS)/Makefile.inc
 
 #
 # Target rules
 #
-all: $(NOBUILD_TARGETS) $(NOINST_TARGETS) $(TARGETS)
-
-$(OBJPATH):
-	$(MKDIR_P) $@
-
-$(BINPATH):
-	$(MKDIR_P) $@
-
-$(OBJPATH)%.o: $(THLIBS)%.c $(THLIBS)%.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(OBJPATH)%.o: %.c %.h
-	$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
-
-$(OBJPATH)%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
-
-$(THLIBS_A): $(addprefix $(OBJPATH),$(THLIBS_OBJ))
-	$(AR) cru $@ $(addprefix $(OBJPATH),$(THLIBS_OBJ))
-	$(RANLIB) $@
-
 main.c: VERSION
 
 $(NNCHAT_BIN): $(addprefix $(OBJPATH),$(NNCHAT_OBJ)) $(THLIBS_A) $(EXTRAOBJS)
-	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
+	@echo " LINK $@"
+	@$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 #
 # Documentation
@@ -69,12 +46,3 @@
 	@links -dump "$@.tmp" > $@
 
 
-#
-# Special targets
-#
-clean:
-	$(RM) $(TARGETS) $(NOINST_TARGETS) $(OBJPATH)*.o
-
-srcclean: clean
-	$(RM) *~
-