# HG changeset patch # User Matti Hamalainen # Date 1290872534 -7200 # Node ID 477449911cb1ec71f499d27c91d63c73cbd1d3b9 # Parent 0e60593006c9d7eefbd8500eb4fb82ecbace70ec Makefile improvements, depend on VERSION etc. diff -r 0e60593006c9 -r 477449911cb1 Makefile.gen --- 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