Mercurial > hg > nnchat

changeset 384:40b95d677f68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 13 Oct 2011 18:07:33 +0300
parents 6d3ce7f28b65
children bbd5edbf1143
files Makefile Makefile.gen
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Oct 03 18:21:10 2011 +0300
+++ b/Makefile	Thu Oct 13 18:07:33 2011 +0300
@@ -6,7 +6,7 @@
 # C-compiler, flags and linker flags
 CC=gcc
 CFLAGS=-DHAVE_STRING_H -DHAVE_INT_TYPES
-LDFLAGS=-lcurses
+LDFLAGS=-lncurses
 
 #CFLAGS += -DHAVE_STDINT_H
 #CFLAGS += -DHAVE_SYS_TYPES_H
--- a/Makefile.gen	Mon Oct 03 18:21:10 2011 +0300
+++ b/Makefile.gen	Thu Oct 13 18:07:33 2011 +0300
@@ -13,9 +13,11 @@
 #
 # Objects
 #
+THLIBS_A=$(OBJPATH)thlibs.a
+THLIBS_OBJ=th_util.o th_string.o th_args.o th_config.o
 NNCHAT_BIN=$(BINPATH)nnchat$(EXEEXT)
 
-TARGETS+=$(NNCHAT_BIN)
+TARGETS+=$(THLIBS_A) $(NNCHAT_BIN)
 
 
 #
@@ -29,8 +31,13 @@
 $(OBJPATH)%.o: %.c %.h
 	$(CC) $(CFLAGS) -c -o $@ $< -I$(THLIBS)
 
-$(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)\" -I$(THLIBS)
+$(THLIBS_A): $(addprefix $(OBJPATH),$(THLIBS_OBJ))
+	$(AR) cru $@ $+
+
+nnchat.c: VERSION
+
+$(NNCHAT_BIN): nnchat.c $(OBJPATH)libnnchat.o $(THLIBS_A) $(EXTRAOBJS)
+	$(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS) -DNN_VERSION=\"$(NN_VERSION)\" -I$(THLIBS)
 
 #
 # Special targets