diff options
| author | Bdale Garbee <bdale@gag.com> | 2018-10-20 01:18:12 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2018-10-20 01:18:12 -0600 |
| commit | 0686a7b8aec524d81bda4c572549a3a068ce0eed (patch) | |
| tree | 2e6061c834b99e3b9668be8b3cfb1627251365d3 /src/Makefile | |
| parent | 6aa451ce81bfdfe679e3f9902043a5f0d235c745 (diff) | |
| parent | cc528f1ff0271ec6488a1a7b91c731183502101e (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/Makefile b/src/Makefile index a1ff84c2..757641f7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,16 +16,9 @@ include Version TOPDIR=. include Makedefs -SDCCDIRS=\ - telemetrum-v1.2 telemetrum-v1.1 telemetrum-v1.0 \ - teledongle-v0.2 \ - telemini-v1.0 \ - telebt-v1.0 \ - telefire-v0.1 telefire-v0.2 \ - telerepeat-v1.0 - ARMM3DIRS=\ easymega-v1.0 easymega-v1.0/flash-loader \ + easymega-v2.0 easymega-v2.0/flash-loader \ telemega-v0.1 telemega-v0.1/flash-loader \ telemega-v1.0 telemega-v1.0/flash-loader \ telemega-v2.0 telemega-v2.0/flash-loader \ @@ -59,15 +52,6 @@ AVRDIRS=\ SUBDIRS= -ifeq ($(strip $(HAVE_PDCLIB)),yes) -PDCLIB=pdclib -CLEAN_PDCLIB=clean-pdclib -endif - -ifeq ($(strip $(HAVE_SDCC)),yes) -SUBDIRS+=$(SDCCDIRS) -endif - ifeq ($(strip $(HAVE_ARM_M3_CC)),yes) SUBDIRS+=$(ARMM3DIRS) foo=bar @@ -82,7 +66,7 @@ ifeq ($(strip $(HAVE_AVR_CC)),yes) SUBDIRS += $(AVRDIRS) endif -ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS) +ALLDIRS=$(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS) all: all-local all-recursive @@ -133,11 +117,3 @@ ao_whiten.h: make-whiten clean-local: $(CLEAN_PDCLIB) rm -f altitude.h ao_kalman.h - -pdclib: - mkdir -p $(PDCLIB_ROOT)/include $(PDCLIB_ROOT)/lib - cd ../pdclib && make && make prefix=`pwd`/../pdclib-root install - -clean-pdclib: - rm -rf $(PDCLIB_ROOT) - cd ../pdclib && make clean |