# HG changeset patch # User Matti Hamalainen # Date 1317655270 -10800 # Node ID 6d3ce7f28b653c027d1bb70e0b36b538d4328808 # Parent 2c9630c765fa2c9d6736a813d31b727ef4f05afc Use a Makefile setting for th-libs location. diff -r 2c9630c765fa -r 6d3ce7f28b65 Makefile.gen --- a/Makefile.gen Mon Oct 03 18:14:27 2011 +0300 +++ b/Makefile.gen Mon Oct 03 18:21:10 2011 +0300 @@ -1,7 +1,7 @@ CFLAGS += -g -W -Wall -Wextra -DTH_NO_DEFAULTS CFLAGS += -O2 #CFLAGS += -std=c99 -pedantic - +THLIBS=th-libs/ # # Version strings @@ -23,14 +23,14 @@ # all: $(NONBUILD) $(TARGETS) -$(OBJPATH)%.o: th-libs/%.c th-libs/%.h +$(OBJPATH)%.o: $(THLIBS)%.c $(THLIBS)%.h $(CC) $(CFLAGS) -c -o $@ $< $(OBJPATH)%.o: %.c %.h - $(CC) $(CFLAGS) -c -o $@ $< -Ith-libs/ + $(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)\" -Ith-libs/ + $(CC) $(CFLAGS) -o $@ $(filter %.c %.o,$+) $(LDFLAGS) -DNN_VERSION=\"$(NN_VERSION)\" -I$(THLIBS) # # Special targets