From 09dafa8861aabea5acd1c5412273430dae562fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Mon, 25 Dec 2017 13:14:01 +0100 Subject: [PATCH] remove libcmini dependency --- tos/vmem_test/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tos/vmem_test/Makefile b/tos/vmem_test/Makefile index 2668436..4b87067 100755 --- a/tos/vmem_test/Makefile +++ b/tos/vmem_test/Makefile @@ -21,10 +21,10 @@ endif DEPEND=depend TOPDIR = ../.. -LIBCMINI=$(TOPDIR)/../libcmini/libcmini +#LIBCMINI=$(TOPDIR)/../libcmini/libcmini -INCLUDE=-I$(LIBCMINI)/include -nostdlib -LIBS=-lcmini -nostdlib -lgcc +#INCLUDE=-I$(LIBCMINI)/include -nostdlib +#LIBS=-lcmini -nostdlib -lgcc CC=$(PREFIX)/bin/gcc CC=$(CROSSBINDIR)gcc @@ -59,7 +59,7 @@ COBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.c,%.o,$(CSRCS))) AOBJS=$(patsubst $(SRCDIR)/%.o,%.o,$(patsubst %.S,%.o,$(ASRCS))) OBJS=$(COBJS) $(AOBJS) -TRGTDIRS=./m5475 ./m5475/mshort +TRGTDIRS=./m5475 OBJDIRS=$(patsubst %,%/objs,$(TRGTDIRS)) # @@ -84,7 +84,8 @@ $(1)/objs/%.o:$(SRCDIR)/%.S $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(APP): $$($(1)_OBJS) @echo CC $$@ - @$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) + #@$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS) + @$(CC) $$(CFLAGS) -o $$@ $$($(1)_OBJS) $(LIBS) @$(STRIP) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))