Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 8420b37648c0ec0f6175396e3031f8f8549502f9..1efa1b33225cf5289e5c896bbadb2db2a460b6a4 100644 (file)
--- 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 \
@@ -36,13 +29,17 @@ ARMM3DIRS=\
        telegps-v1.0 telegps-v1.0/flash-loader \
        telegps-v2.0 telegps-v2.0/flash-loader \
        telelco-v0.2 telelco-v0.2/flash-loader \
+       telelco-v0.2-cc1200 telelco-v0.2-cc1200/flash-loader \
        telelco-v0.3 telelco-v0.3/flash-loader \
+       telelco-v2.0 telelco-v2.0/flash-loader \
        teledongle-v3.0 teledongle-v3.0/flash-loader \
        teleballoon-v2.0 \
        telebt-v3.0 telebt-v3.0/flash-loader \
        telebt-v4.0 telebt-v4.0/flash-loader \
        telelcotwo-v0.1 telelcotwo-v0.1/flash-loader \
        telefiretwo-v0.1 telefiretwo-v0.1/flash-loader \
+       telefireeight-v1.0 telefireeight-v1.0/flash-loader \
+       telefireeight-v2.0 telefireeight-v2.0/flash-loader 
 
 ARMM0DIRS=\
        easymini-v1.0 easymini-v1.0/flash-loader \
@@ -56,15 +53,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
@@ -79,7 +67,7 @@ ifeq ($(strip $(HAVE_AVR_CC)),yes)
 SUBDIRS += $(AVRDIRS)
 endif
 
-ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
+ALLDIRS=$(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS)
 
 all: all-local all-recursive
 
@@ -130,11 +118,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