X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=Makefile;h=7bf0ddbefe9200454150d547308cad4630ada0a8;hb=a2ae9e1af72130262556e644730c6c721a93d1f2;hp=bb446cf297b8a103f3a3edb22228d1fcf88d9646;hpb=90efcb0b905753a2eac864bc1a869781d7c31919;p=protos%2Flibecoli.git

diff --git a/Makefile b/Makefile
index bb446cf..7bf0ddb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2016, Olivier MATZ <zer0@droids-corp.org>
 
-ECOLI ?= $(abspath ..)
+ECOLI ?= $(abspath .)
 include $(ECOLI)/mk/ecoli-pre.mk
 
 # output path with trailing slash
@@ -9,7 +9,7 @@ O ?= build/
 
 # XXX -O0
 CFLAGS  = -g -O0 -Wall -Werror -W -Wextra -fPIC -Wmissing-prototypes
-CFLAGS += -I.
+CFLAGS += -Ilibecoli -Ilibecoli_yaml
 
 # XXX coverage
 CFLAGS += --coverage
@@ -55,16 +55,24 @@ srcs += ecoli_parse.c
 srcs += ecoli_string.c
 srcs += ecoli_vec.c
 
-shlib-y-$(O)libecoli.so := $(srcs)
+# libs
+shlib-y-$(O)libecoli.so := $(addprefix libecoli/,$(srcs))
 
+cflags-$(O)libecoli_yaml.so = -Ilibecoli_yaml
+shlib-y-$(O)libecoli_yaml.so := libecoli_yaml/ecoli_yaml.c
+
+# tests
 ldflags-$(O)test = -rdynamic
-exe-y-$(O)test = $(srcs) main.c
+exe-y-$(O)test = $(addprefix libecoli/,$(srcs)) test/test.c
 
+# examples
 ldflags-$(O)readline = -lreadline -ltermcap
-exe-y-$(O)readline = $(srcs) main-readline.c
+exe-y-$(O)readline = $(addprefix libecoli/,$(srcs)) \
+	examples/readline/main.c
 
 ldflags-$(O)parse-yaml = -lyaml
-exe-y-$(O)parse-yaml = $(srcs) parse-yaml.c
+exe-y-$(O)parse-yaml = $(addprefix libecoli/,$(srcs)) \
+	libecoli_yaml/ecoli_yaml.c examples/yaml/parse-yaml.c
 
 include $(ECOLI)/mk/ecoli-post.mk