Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put libcmini dependencies into a variable, cleanup clean target

Browse Source
This commit is contained in:
Markus Fröschle
2016-04-03 19:04:18 +00:00
parent 627aa0c2c4
commit e73333d893
6 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -186,6 +186,8 @@ clean:
do rm -f $$d/*.map $$d/*.s19 $$d/*.elf $$d/*.lk $$d/*.a $$d/objs/* $$d/depend;\ do rm -f $$d/*.map $$d/*.s19 $$d/*.elf $$d/*.lk $$d/*.a $$d/objs/* $$d/depend;\
done done
rm -f tags rm -f tags
(cd tos; make clean)
# flags for targets # flags for targets

8
tos/Makefile
View File

@@ -17,3 +17,11 @@ vmem_test:
pci_test: pci_test:
$(MAKE) -C $@ $(MAKE) -C $@
.PHONY: clean
clean:
(cd jtagwait; make clean)
(cd bascook; make clean)
(cd vmem_test; make clean)
(cd pci_test; make clean)

9
tos/bascook/Makefile
View File

@@ -23,7 +23,9 @@ TOPDIR= ../..
BAS_INCLUDE=-I$(TOPDIR)/../BaS_gcc/include BAS_INCLUDE=-I$(TOPDIR)/../BaS_gcc/include
INCLUDE=-I$(TOPDIR)/../libcmini/include $(BAS_INCLUDE) -nostdlib LIBCMINI=$(TOPDIR)/../libcmini/libcmini
INCLUDE=-I$(LIBCMINI)/include $(BAS_INCLUDE) -nostdlib
LIBS=-lcmini -nostdlib -lgcc LIBS=-lcmini -nostdlib -lgcc
CC=$(PREFIX)/bin/gcc CC=$(PREFIX)/bin/gcc
@@ -72,7 +74,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
$(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
$(1)/$(APP): $$($(1)_OBJS) $(1)/$(APP): $$($(1)_OBJS)
$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/m5475/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/m5475 $(LIBS) $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/m5475/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/m5475 $(LIBS)
$(STRIP) $$@ $(STRIP) $$@
endef endef
$(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))
@@ -90,8 +92,7 @@ clean:
.PHONY: printvars .PHONY: printvars
printvars: printvars:
@$(foreach V,$(.VARIABLES), $(if $(filter-out environment% default automatic, $(origin $V)),$(warning $V=$($V)))) @$(foreach V,$(.VARIABLES), $(if $(filter-out environment% default automatic, $(origin $V)),$(warning $V=$($V))))
ifneq (clean,$(MAKECMDGOALS)) ifneq (clean,$(MAKECMDGOALS))
-include $(DEPEND) -include $(DEPEND)
endif endif

6
tos/jtagwait/Makefile
View File

@@ -21,7 +21,9 @@ endif
DEPEND=depend DEPEND=depend
TOPDIR = ../.. TOPDIR = ../..
INCLUDE=-I$(TOPDIR)/../libcmini/include -nostdlib LIBCMINI=$(TOPDIR)/../libcmini/libcmini
INCLUDE=-I$(LIBCMINI)/include -nostdlib
LIBS=-lcmini -nostdlib -lgcc LIBS=-lcmini -nostdlib -lgcc
CC=$(PREFIX)/bin/gcc CC=$(PREFIX)/bin/gcc
@@ -78,7 +80,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
$(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
$(1)/$(APP): $$($(1)_OBJS) $(1)/$(APP): $$($(1)_OBJS)
$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/$(1)/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/$(1) $(LIBS) $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS)
$(STRIP) $$@ $(STRIP) $$@
endef endef
$(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))

6
tos/pci_test/Makefile
View File

@@ -21,7 +21,9 @@ endif
DEPEND=depend DEPEND=depend
TOPDIR = ../.. TOPDIR = ../..
INCLUDE=-I$(TOPDIR)/../libcmini/include -nostdlib LIBCMINI=$(TOPDIR)/../libcmini/libcmini
INCLUDE=-I$(LIBCMINI)/include -nostdlib
LIBS=-lcmini -nostdlib -lgcc LIBS=-lcmini -nostdlib -lgcc
CC=$(PREFIX)/bin/gcc CC=$(PREFIX)/bin/gcc
@@ -79,7 +81,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
$(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
$(1)/$(APP): $$($(1)_OBJS) $(1)/$(APP): $$($(1)_OBJS)
$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/$(1)/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/$(1) $(LIBS) $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS)
$(STRIP) $$@ $(STRIP) $$@
endef endef
$(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))

6
tos/vmem_test/Makefile
View File

@@ -21,7 +21,9 @@ endif
DEPEND=depend DEPEND=depend
TOPDIR = ../.. TOPDIR = ../..
INCLUDE=-I$(TOPDIR)/../libcmini/include -nostdlib LIBCMINI=$(TOPDIR)/../libcmini/libcmini
INCLUDE=-I$(LIBCMINI)/include -nostdlib
LIBS=-lcmini -nostdlib -lgcc LIBS=-lcmini -nostdlib -lgcc
CC=$(PREFIX)/bin/gcc CC=$(PREFIX)/bin/gcc
@@ -79,7 +81,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
$(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
$(1)/$(APP): $$($(1)_OBJS) $(1)/$(APP): $$($(1)_OBJS)
$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/$(1)/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/$(1) $(LIBS) $(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS)
#$(STRIP) $$@ #$(STRIP) $$@
endef endef
$(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))