changeset 219:477449911cb1

Makefile improvements, depend on VERSION etc.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 27 Nov 2010 17:42:14 +0200
parents 0e60593006c9
children ec525f2d0040
files Makefile.gen
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Sun Nov 21 04:22:06 2010 +0200
+++ b/Makefile.gen	Sat Nov 27 17:42:14 2010 +0200
@@ -1,7 +1,6 @@
 
 CFLAGS+=-g -W -Wall -O2 -DTH_NO_DEFAULTS
 #CFLAGS+=-g -W -Wall -DTH_NO_DEFAULTS
-COMP=$(CC) $(CFLAGS)
 
 #
 # Version strings
@@ -24,10 +23,10 @@
 all: $(NONBUILD) $(TARGETS)
 
 $(OBJPATH)%.o: %.c %.h
-	$(COMP) -c -o $@ $<
+	$(CC) $(CFLAGS) -c -o $@ $<
 
-$(NNCHAT_BIN): nnchat.c $(OBJPATH)libnnchat.o $(OBJPATH)th_util.o $(OBJPATH)th_string.o $(OBJPATH)th_args.o $(OBJPATH)th_config.o $(EXTRAOBJS)
-	$(COMP) -o $@ $+ $(LDFLAGS) -DNN_VERSION=\"$(NN_VERSION)\"
+$(NNCHAT_BIN): nnchat.c $(OBJPATH)libnnchat.o $(OBJPATH)th_util.o $(OBJPATH)th_string.o $(OBJPATH)th_args.o $(OBJPATH)th_config.o $(EXTRAOBJS) VERSION
+	$(CC) $(CFLAGS) -o $@ $(filter %.c %.o,$+) $(LDFLAGS) -DNN_VERSION=\"$(NN_VERSION)\"
 
 #
 # Special targets