X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2FMakefile;h=f0c9cbb5631ffe0f1a32d46276b5a4548e4afed4;hp=6bbb2a38b9f34c7d72ee2dd2decae1f28c6680b4;hb=d31fda73fef37cf6a9e449c99f3197b713b93acb;hpb=291bcd751991960ae3dad8c6523323fdcbafa16d diff --git a/src/Makefile b/src/Makefile index 6bbb2a38..f0c9cbb5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,21 +12,13 @@ vpath kalman_micro.5c kalman vpath load_csv.5c kalman vpath matrix.5c kalman -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 +include Makedefs ARMM3DIRS=\ - fox1ihu fox1ihu/flash-loader \ 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 \ @@ -39,12 +31,16 @@ ARMM3DIRS=\ 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 \ + telefireone-v1.0 telefireone-v1.0/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 \ @@ -54,19 +50,10 @@ ARMM0DIRS=\ micropeak-v2.0 micropeak-v2.0/flash-loader AVRDIRS=\ - micropeak microkite + micropeak microkite microsplash 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 @@ -81,7 +68,7 @@ ifeq ($(strip $(HAVE_AVR_CC)),yes) SUBDIRS += $(AVRDIRS) endif -ALLDIRS=$(SDCCDIRS) $(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS) +ALLDIRS=$(ARMM3DIRS) $(ARMM0DIRS) $(AVRDIRS) all: all-local all-recursive @@ -132,11 +119,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