From: Martin Jerabek Date: Wed, 30 Mar 2016 17:52:41 +0000 (+0200) Subject: Makefile fixes X-Git-Url: https://rtime.felk.cvut.cz/gitweb/fpga/zynq/canbench-sw.git/commitdiff_plain/2313a20e8d477e59e91de071dd694f14cf3f2a71 Makefile fixes --- diff --git a/Makefile b/Makefile index 6ccb27c..350b46c 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,9 @@ # 3. apps (latester) system_project: - cd system/scripts && vivado -mode batch -nolog -nojournal -source recreate.tcl + cd system/script && vivado -mode batch -nolog -nojournal -source recreate.tcl system/system.hdf: - cd system/scripts && vivado -mode batch -nolog -nojournal -source build.tcl + cd system/script && vivado -mode batch -nolog -nojournal -source build.tcl petalinux_config: system/system.hdf $(MAKE) -C petalinux config diff --git a/petalinux/components/apps/latester/Makefile b/petalinux/components/apps/latester/Makefile index d0300bc..26b82cc 100644 --- a/petalinux/components/apps/latester/Makefile +++ b/petalinux/components/apps/latester/Makefile @@ -13,11 +13,13 @@ bindir := $(d)/_compiled all: install build: + touch config.omk-default $(MAKE) -C $(srcdir) MAKERULES_DIR=$(d) # $(CC) $(LDFLAGS) -o $@ $(APP_OBJS) $(LDLIBS) clean: $(MAKE) -C $(srcdir) MAKERULES_DIR=$(d) clean + -rm -Rf _compiled _build .PHONY: all build install