Mercurial > hg > nnchat

changeset 465:c3b3b6d89084

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify buildsystem a bit.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 26 May 2012 06:18:19 +0300
parents 35d67bd0613b
children 796508f828f6
files Makefile.gen
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Sat May 26 06:01:06 2012 +0300
+++ b/Makefile.gen	Sat May 26 06:18:19 2012 +0300
@@ -9,12 +9,15 @@
 NN_VERSION := $(shell cat VERSION)
 comma:= ,
 NN_VERSION_COM := $(subst .,$(comma),$(NN_VERSION))
+CFLAGS += -DNN_VERSION=\"$(NN_VERSION)\"
 
 #
 # Objects
 #
 THLIBS_A=$(OBJPATH)thlibs.a
 THLIBS_OBJ=th_util.o th_string.o th_args.o th_config.o
+
+NNCHAT_OBJ=main.o util.o network.o
 NNCHAT_BIN=$(BINPATH)nnchat$(EXEEXT)
 
 TARGETS+=$(THLIBS_A) $(NNCHAT_BIN)
@@ -31,13 +34,16 @@
 $(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 $@ $+
 
 main.c: VERSION
 
-$(NNCHAT_BIN): main.c $(OBJPATH)util.o $(OBJPATH)network.o $(THLIBS_A) $(EXTRAOBJS)
-	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS) -DNN_VERSION=\"$(NN_VERSION)\" -I$(THLIBS)
+$(NNCHAT_BIN): $(addprefix $(OBJPATH),$(NNCHAT_OBJ)) $(THLIBS_A) $(EXTRAOBJS)
+	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS)
 
 #
 # Special targets