Skip to content

W
White Rabbit Trigger Distribution
Commit 4b073d15 authored by Dimitris Lampridis's avatar Dimitris Lampridis
Browse files
Options

[sw] allow full software installation from top-level makefile

parent d4aaee21
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 9 deletions
software/Makefile
View file @ 4b073d15
...@@ -10,16 +10,19 @@ REPO_PARENT ?= $(CURDIR)/.. ...@@ -10,16 +10,19 @@ REPO_PARENT ?= $(CURDIR)/..
# on Mock Turtle. # on Mock Turtle.
WRTD_DEP_TRTL ?= $(CURDIR)/../dependencies/mock-turtle WRTD_DEP_TRTL ?= $(CURDIR)/../dependencies/mock-turtle
DIRS = $(WRTD_DEP_TRTL)/software drivers lib firmware DIRS = $(WRTD_DEP_TRTL)/software drivers lib lib/python tools
all clean: $(DIRS) all clean install: $(DIRS)
tools: lib tools: lib
.PHONY: all clean $(DIRS) .PHONY: all clean install $(DIRS) firmware
clean: TARGET = clean clean: TARGET = clean
modules: TARGET = modules install: TARGET = install
$(DIRS): $(DIRS):
$(MAKE) -C $@ $(TARGET) $(MAKE) -C $@ $(TARGET)
firmware:
$(MAKE) -C firmware
software/drivers/Makefile
View file @ 4b073d15
...@@ -13,8 +13,12 @@ all: modules ...@@ -13,8 +13,12 @@ all: modules
.PHONY: all modules clean help install modules_install .PHONY: all modules clean help install modules_install
modules help install modules_install: modules help modules_install:
$(MAKE) -C $(LINUX) M=$(shell pwd) DRV_VERSION=$(DRV_VERSION) $@ $(MAKE) -C $(LINUX) M=$(shell pwd) DRV_VERSION=$(DRV_VERSION) $@
install:
$(MAKE) -C $(LINUX) M=$(shell pwd) DRV_VERSION=$(DRV_VERSION) modules_install
# be able to run the "clean" rule even if $(LINUX) is not valid # be able to run the "clean" rule even if $(LINUX) is not valid
clean: clean:
rm -rf *.o *~ .*.cmd *.ko *.mod.c .tmp_versions Module.symvers \ rm -rf *.o *~ .*.cmd *.ko *.mod.c .tmp_versions Module.symvers \
......
software/lib/python/setup.py
View file @ 4b073d15
#!/usr/bin/env python #!/usr/bin/env python
from setuptools import setup from setuptools import setup, find_packages
setup( setup(
name='PyWrtd', name='PyWrtd',
...@@ -15,6 +15,6 @@ setup( ...@@ -15,6 +15,6 @@ setup(
"Documentation": "https://wrtd.readthedocs.io", "Documentation": "https://wrtd.readthedocs.io",
"Forum" : "https://forums.ohwr.org/c/wrtd", "Forum" : "https://forums.ohwr.org/c/wrtd",
}, },
packages=['PyWrtd'], packages=find_packages(),
license='LGPLv3', license='LGPLv3',
) )
software/tools/wrtd_tool/wrtd_tool.py
View file @ 4b073d15
...@@ -11,7 +11,7 @@ import time ...@@ -11,7 +11,7 @@ import time
import argparse import argparse
import re import re
from PyWrtd import * from PyWrtd import PyWrtd
def signal_handler(sig, frame): def signal_handler(sig, frame):
sys.exit(0) sys.exit(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment