diff options
Diffstat (limited to 'software')
-rw-r--r-- | software/ctr/Makefile | 9 | ||||
-rw-r--r-- | software/idm/Makefile | 3 | ||||
-rw-r--r-- | software/ihu/Makefile | 3 | ||||
-rw-r--r-- | software/pic.include.mk | 68 | ||||
-rw-r--r-- | software/ttx/Makefile | 7 |
5 files changed, 12 insertions, 78 deletions
diff --git a/software/ctr/Makefile b/software/ctr/Makefile index a96e463..cc9a49f 100644 --- a/software/ctr/Makefile +++ b/software/ctr/Makefile @@ -8,10 +8,10 @@ ## ESC im Labor and realraum. ## ## Please visit the project hompage at sat.mur.at for further information. -## +## ## ## Copyright (C) 2011-2015 Christian Pointner <equinox@mur.at> -## +## ## This file is part of mur.sat. ## ## mur.sat is free software: you can redistribute it and/or modify @@ -30,7 +30,6 @@ PROJECT := ctr PROC_TYPE := 16F1847 +SPREADPIC_PATH := ../../contrib/pic-utils -include ../pic.include.mk - -AFLAGS := $(AFLAGS) -y +include $(SPREADPIC_PATH)/include.mk diff --git a/software/idm/Makefile b/software/idm/Makefile index f5bfa6c..fde1bf9 100644 --- a/software/idm/Makefile +++ b/software/idm/Makefile @@ -30,5 +30,6 @@ PROJECT := idm PROC_TYPE := 16F1847 +SPREADPIC_PATH := ../../contrib/pic-utils -include ../pic.include.mk +include $(SPREADPIC_PATH)/include.mk diff --git a/software/ihu/Makefile b/software/ihu/Makefile index 8df9220..5989509 100644 --- a/software/ihu/Makefile +++ b/software/ihu/Makefile @@ -30,8 +30,9 @@ PROJECT := ihu PROC_TYPE := 16F887 +SPREADPIC_PATH := ../../contrib/pic-utils -include ../pic.include.mk +include $(SPREADPIC_PATH)/include.mk DOWNLOADER := ../pic.bootloader/downloader.py BOOT_NAME := IHU diff --git a/software/pic.include.mk b/software/pic.include.mk deleted file mode 100644 index 5efadde..0000000 --- a/software/pic.include.mk +++ /dev/null @@ -1,68 +0,0 @@ -## -## spreadspace pic utils -## -## -## Copyright (C) 2011-2013 Christian Pointner <equinox@spreadspace.org> -## -## This file is part of spreadspace pic utils. -## -## spreadspace pic utils is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## any later version. -## -## spreadspace pic utils is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with spreadspace pic utils. If not, see <http://www.gnu.org/licenses/>. -## - -SRCFILE := $(PROJECT).asm -HEXFILE := $(PROJECT).hex - -ASM := gpasm -AFLAGS := -PROG := usbpicprog - -.PHONY: clean distclean program verify erase run stop - -all: $(HEXFILE) - --include $(PROJECT).d - -$(HEXFILE): $(SRCFILE) - $(ASM) $(AFLAGS) -M -o $@ $< - - -distclean: clean - find . -name *.hex -exec rm -f {} \; - find . -name *.cod -exec rm -f {} \; - find . -name *.lst -exec rm -f {} \; - find . -name "*.\~*" -exec rm -rf {} \; - -clean: - rm -f $(PROJECT).hex - rm -f $(PROJECT).cod - rm -f $(PROJECT).lst - rm -f $(PROJECT).d - rm -f $(HEXFILE) - -program: $(HEXFILE) stop erase write verify - -write: $(HEXFILE) - @$(PROG) -p $(PROC_TYPE) -s -w -f $(HEXFILE) - -verify: $(HEXFILE) - @$(PROG) -p $(PROC_TYPE) -s -v -f $(HEXFILE) - -erase: - @$(PROG) -p $(PROC_TYPE) -e - -run: - @$(PROG) --run - -stop: - @$(PROG) --stop diff --git a/software/ttx/Makefile b/software/ttx/Makefile index 47f8ae9..6ab5314 100644 --- a/software/ttx/Makefile +++ b/software/ttx/Makefile @@ -8,10 +8,10 @@ ## ESC im Labor and realraum. ## ## Please visit the project hompage at sat.mur.at for further information. -## +## ## ## Copyright (C) 2011-2015 Christian Pointner <equinox@mur.at> -## +## ## This file is part of mur.sat. ## ## mur.sat is free software: you can redistribute it and/or modify @@ -30,5 +30,6 @@ PROJECT := ttx PROC_TYPE := 12F635 +SPREADPIC_PATH := ../../contrib/pic-utils -include ../pic.include.mk +include $(SPREADPIC_PATH)/include.mk |