summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUros Majstorovic <majstor@majstor.org>2022-01-30 03:03:20 +0100
committerUros Majstorovic <majstor@majstor.org>2022-01-30 03:03:20 +0100
commit9f5c5c6263383cc7d6fb03f949465df5a02734b1 (patch)
tree548a2c79820407dc0a9d3f71e56f71376bdf53b7
parent483b954dff83b86877184718acdd66533cb694ac (diff)
fixed build
-rw-r--r--ecp/src/Makefile7
-rw-r--r--ecp/src/Makefile.fe31010
-rw-r--r--ecp/src/Makefile.posix12
3 files changed, 13 insertions, 16 deletions
diff --git a/ecp/src/Makefile b/ecp/src/Makefile
index 991574a..502f582 100644
--- a/ecp/src/Makefile
+++ b/ecp/src/Makefile
@@ -1,8 +1,9 @@
-include Makefile.platform
CFLAGS += $(PIC) -I.
-obj = core.o timer.o dir.o dir_srv.o $(obj_rbuf)
-subdirs = crypto platform $(htable) $(vconn)
+obj = core.o timer.o dir.o dir_srv.o
+subdirs = crypto platform
+
+include Makefile.platform
%.o: %.c
$(CC) $(CFLAGS) -c $<
diff --git a/ecp/src/Makefile.fe310 b/ecp/src/Makefile.fe310
index 5b670c1..c013b23 100644
--- a/ecp/src/Makefile.fe310
+++ b/ecp/src/Makefile.fe310
@@ -1,8 +1,6 @@
-platform=fe310
+include $(FE310_HOME)/common.mk
-htable=
-vconn=vconn
-rbuf_obj=
+platform = fe310
+subdirs += vconn
-include $(FE310_HOME)/common.mk
-CFLAGS += -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -I$(FE310_HOME)
+CFLAGS += -DECP_WITH_VCONN=1 -DECP_DEBUG=1 -I$(FE310_HOME)
diff --git a/ecp/src/Makefile.posix b/ecp/src/Makefile.posix
index 0c7e811..93b9a98 100644
--- a/ecp/src/Makefile.posix
+++ b/ecp/src/Makefile.posix
@@ -1,8 +1,6 @@
-platform=posix
+platform = posix
+obj += rbuf.o rbuf_send.o rbuf_recv.o msgq.o
+subdirs += htable vconn
-htable=htable
-vconn=vconn
-obj_rbuf=rbuf.o rbuf_send.o rbuf_recv.o msgq.o
-
-CFLAGS = -O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_RBUF=1 -DECP_WITH_MSGQ=1 -DECP_WITH_VCONN=1 -DECP_WITH_DIRSRV -DECP_DEBUG=1
-LDFLAGS = -lm -pthread \ No newline at end of file
+CFLAGS += -O3 -DECP_WITH_PTHREAD=1 -DECP_WITH_HTABLE=1 -DECP_WITH_RBUF=1 -DECP_WITH_MSGQ=1 -DECP_WITH_VCONN=1 -DECP_WITH_DIRSRV -DECP_DEBUG=1
+LDFLAGS += -lm -pthread \ No newline at end of file