projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 7f6cbfa)
altos: Use installed pdclib
authorKeith Packard <keithp@keithp.com>
Thu, 10 Oct 2013 07:00:05 +0000 (00:00 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 10 Oct 2013 07:01:26 +0000 (00:01 -0700)
Switch over to the installed pdclib everywhere

Signed-off-by: Keith Packard <keithp@keithp.com>
19 files changed:
configure.ac patch | blob | history
src/easymini-v1.0/Makefile patch | blob | history
src/lpc/Makefile-flash.defs patch | blob | history
src/lpc/Makefile-lpc.defs [new file with mode: 0644] patch | blob
src/lpc/Makefile.defs patch | blob | history
src/lpcxpresso/Makefile patch | blob | history
src/megadongle-v0.1/Makefile patch | blob | history
src/stm-demo/Makefile patch | blob | history
src/stm-flash/Makefile patch | blob | history
src/stm/Makefile-flash.defs patch | blob | history
src/stm/Makefile.defs patch | blob | history
src/telegps-v0.1/Makefile patch | blob | history
src/telegps-v0.3/Makefile patch | blob | history
src/telelco-v0.1/Makefile patch | blob | history
src/telelco-v0.2/Makefile patch | blob | history
src/telemega-v0.1/Makefile patch | blob | history
src/telemega-v0.3/Makefile patch | blob | history
src/telemetrum-v2.0/Makefile patch | blob | history
src/telescience-v0.2/Makefile patch | blob | history

diff --git a/configure.ac b/configure.ac
index de344335805eaa8db5ea1750369504bfa4c63f20..8024b7c602d674a538ef89026d20c76917676213 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -242,22 +242,35 @@ AC_SUBST(ARM_CC)
 if test "x$HAVE_ARM_CC" = "xyes"; then
        save_CC="$CC"
        save_CFLAGS="$CFLAGS"
+       save_LIBS="$LIBS"
        CC="$ARM_CC"
        CFLAGS="-mthumb -mcpu=cortex-m0"
+       LIBS="-ffreestanding -nostdlib"
        AC_LANG_PUSH([C])
 
        AC_MSG_CHECKING([if ]$ARM_CC[ supports cortex-m0])
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int i;])],
                          [HAVE_ARM_M0_CC=yes],
                          [HAVE_ARM_M0_CC=no])
-        AC_MSG_RESULT([$HAVE_ARM_M0])
+        AC_MSG_RESULT([$HAVE_ARM_M0_CC])
+
+       AC_CHECK_LIB(pdclib-cortex-m0,memcpy,
+                    [],
+                    [HAVE_ARM_M0_CC=no])
+
        CFLAGS="-mthumb -mcpu=cortex-m3"
        AC_MSG_CHECKING([if ]$ARM_CC[ supports cortex-m3])
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int i;])],
                          [HAVE_ARM_M3_CC=yes],
                          [HAVE_ARM_M3_CC=no])
-        AC_MSG_RESULT([$HAVE_ARM_M3])
+        AC_MSG_RESULT([$HAVE_ARM_M3_CC])
+
+       AC_CHECK_LIB(pdclib-cortex-m3,memcpy,
+                    [],
+                    [HAVE_ARM_M3_CC=no])
+
        AC_LANG_POP([C])
+       LIBS="$save_LIBS"
        CFLAGS="$save_CFLAGS"
        CC="$save_CC"
 else
diff --git a/src/easymini-v1.0/Makefile b/src/easymini-v1.0/Makefile
index ec305c94dfed9b07974856fbc4a8ef3f0db91fa0..6ab794254b901429e1729b02f70521caa93bee23 100644 (file)
--- a/src/easymini-v1.0/Makefile
+++ b/src/easymini-v1.0/Makefile
@@ -60,10 +60,8 @@ OBJ=$(SRC:.c=.o)
 
 all: $(PROG)
 
-LDFLAGS=-L../lpc -Wl,-Taltos.ld
-
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/lpc/Makefile-flash.defs b/src/lpc/Makefile-flash.defs
index ab7181b9d2be86e1e03d3c58cb1d54563dfbf329..bb90b0d76c49e38c33cd563e6ef2b4b116742f3d 100644 (file)
--- a/src/lpc/Makefile-flash.defs
+++ b/src/lpc/Makefile-flash.defs
@@ -1,39 +1,4 @@
-vpath % $(TOPDIR)/lpc:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/core:$(TOPDIR)/util:$(TOPDIR)
-vpath ao-make-product.5c $(TOPDIR)/util
-
-.SUFFIXES: .elf .ihx
-
-.elf.ihx:
-       objcopy -O ihex $*.elf $@
-
-
-ifndef VERSION
-include $(TOPDIR)/Version
-endif
-include $(TOPDIR)/Makedefs
-
-CC=$(ARM_CC)
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
-SAT_CFLAGS=-I$(SAT)/include
-
-AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR)
-STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
-
-LDFLAGS=-L$(TOPDIR)/lpc -Wl,-Taltos-loader.ld
-
-NICKLE=nickle
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-.c.o:
-       $(call quiet,CC) -c $(CFLAGS) -o $@ $<
+include $(TOPDIR)/lpc/Makefile-lpc.defs
 
 INC = \
        ao.h \
@@ -68,13 +33,15 @@ PRODUCT=AltosFlash-$(VERSION)
 PRODUCT_DEF=-DALTOS_FLASH
 IDPRODUCT=0x000a
 
-CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
+CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS) -g -Os
+
+LDFLAGS=$(CFLAGS) -L$(TOPDIR)/lpc -Wl,-Taltos-loader.ld
 
 PROGNAME=altos-flash
 PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf
 
 $(PROG): Makefile $(OBJ) altos-loader.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ao_product.h: ao-make-product.5c $(TOPDIR)/Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/lpc/Makefile-lpc.defs b/src/lpc/Makefile-lpc.defs
new file mode 100644 (file)
index 0000000..32a02a4
--- /dev/null
+++ b/src/lpc/Makefile-lpc.defs
@@ -0,0 +1,44 @@
+ifndef TOPDIR
+TOPDIR=..
+endif
+
+include $(TOPDIR)/Makedefs
+
+vpath % $(TOPDIR)/lpc:$(TOPDIR)/product:$(TOPDIR)/drivers:$(TOPDIR)/core:$(TOPDIR)/util:$(TOPDIR)/kalman:$(TOPDIR/aes):$(TOPDIR)
+vpath make-altitude $(TOPDIR)/util
+vpath make-kalman $(TOPDIR)/util
+vpath kalman.5c $(TOPDIR)/kalman
+vpath kalman_filter.5c $(TOPDIR)/kalman
+vpath load_csv.5c $(TOPDIR)/kalman
+vpath matrix.5c $(TOPDIR)/kalman
+vpath ao-make-product.5c $(TOPDIR)/util
+
+.SUFFIXES: .elf .ihx
+
+.elf.ihx:
+       objcopy -O ihex $*.elf $@
+
+
+ifndef VERSION
+include $(TOPDIR)/Version
+endif
+
+CC=$(ARM_CC)
+
+AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR)
+LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
+
+NICKLE=nickle
+
+LIBS=-lpdclib-cortex-m0 -lgcc
+
+V=0
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @printf "  $1 $2 $@\n"; $($1)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
+
+.c.o:
+       $(call quiet,CC) -c $(CFLAGS) -o $@ $<
diff --git a/src/lpc/Makefile.defs b/src/lpc/Makefile.defs
index d541230ac354c41dc520c34693baa8a5f7714e10..b6d739c2ac5d0758249db9a176417e9b0ba67eec 100644 (file)
--- a/src/lpc/Makefile.defs
+++ b/src/lpc/Makefile.defs
@@ -1,43 +1,11 @@
-vpath % ../lpc:../product:../drivers:../core:../util:../kalman:../aes:..
-vpath make-altitude ../util
-vpath make-kalman ../util
-vpath kalman.5c ../kalman
-vpath kalman_filter.5c ../kalman
-vpath load_csv.5c ../kalman
-vpath matrix.5c ../kalman
-vpath ao-make-product.5c ../util
-
 ifndef TOPDIR
 TOPDIR=..
 endif
 
-ifndef VERSION
-include $(TOPDIR)/Version
-endif
+include $(TOPDIR)/lpc/Makefile-lpc.defs
 include $(TOPDIR)/Makedefs
 
-CC=$(ARM_CC)
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m0.a
-SAT_CFLAGS=-I$(SAT)/include
-
-AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)
-LPC_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m0 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
-
-LDFLAGS=$(LPC_CFLAGS) -L$(TOPDIR)/stm -Wl,-Taltos.ld
-
-NICKLE=nickle
-
-V=0
-# The user has explicitly enabled quiet compilation.
-ifeq ($(V),0)
-quiet = @printf "  $1 $2 $@\n"; $($1)
-endif
-# Otherwise, print the full command line.
-quiet ?= $($1)
-
-.c.o:
-       $(call quiet,CC) -c $(CFLAGS) $<
+LDFLAGS=$(CFLAGS) -L$(TOPDIR)/lpc -Wl,-Taltos.ld
 
 ao_serial_lpc.h: $(TOPDIR)/lpc/baud_rate ao_pins.h
        nickle $(TOPDIR)/lpc/baud_rate `awk '/AO_LPC_CLKOUT/{print $$3}' ao_pins.h` > $@
diff --git a/src/lpcxpresso/Makefile b/src/lpcxpresso/Makefile
index 3745f283f61612839fc934f59b9dc9bf9e86e0a4..374c052ffa207bf950f813e4b1096ffd608c18ce 100644 (file)
--- a/src/lpcxpresso/Makefile
+++ b/src/lpcxpresso/Makefile
@@ -45,7 +45,7 @@ all: $(PROG)
 LDFLAGS=-L../lpc -Wl,-Taltos.ld
 
 $(PROG): Makefile $(OBJ)
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/megadongle-v0.1/Makefile b/src/megadongle-v0.1/Makefile
index 7f12963f00f9fee5137a8992f3cc5b9dae8bfd21..268f186f831c4ff202f511912483e3c663a2bc81 100644 (file)
--- a/src/megadongle-v0.1/Makefile
+++ b/src/megadongle-v0.1/Makefile
@@ -69,7 +69,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)
 
diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index 48fa07ebf5240b881dfdaada8ee76f63e743a325..990968c2f48ca1b5d77229220384f8ebf63a631b 100644 (file)
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -56,7 +56,7 @@ all: $(ELF) $(IHX)
 LDFLAGS=-L../stm -Wl,-Taltos.ld
 
 $(ELF): Makefile $(OBJ)
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(LIBS)
 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/stm-flash/Makefile b/src/stm-flash/Makefile
index 1ea35581c41d0da7af115da74aed1154189c43e6..5c0699e1bbed20d510a76b69325f82e098dd6633 100644 (file)
--- a/src/stm-flash/Makefile
+++ b/src/stm-flash/Makefile
@@ -41,7 +41,7 @@ all: $(PROG)
 LDFLAGS=-L../stm -Wl,-Taltos-loader.ld
 
 $(PROG): Makefile $(OBJ)
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ao_product.h: ao-make-product.5c ../Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/stm/Makefile-flash.defs b/src/stm/Makefile-flash.defs
index f429d9bda7663b1ab65c7975022cdfbb84d18177..159f8b9caf960b27af15be8daa53e147fa7fac8e 100644 (file)
--- a/src/stm/Makefile-flash.defs
+++ b/src/stm/Makefile-flash.defs
@@ -12,9 +12,7 @@ endif
 include $(TOPDIR)/Makedefs
 
 CC=$(ARM_CC)
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
-SAT_CFLAGS=-I$(SAT)/include
+LIBS=-lpdclib-cortex-m3 -lgcc
 
 AO_CFLAGS=-I. -I$(TOPDIR)/stm -I$(TOPDIR)/core -I$(TOPDIR)/drivers -I$(TOPDIR)/product -I$(TOPDIR)
 STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
@@ -73,7 +71,7 @@ PROGNAME=altos-flash
 PROG=$(HARDWARE)-$(PROGNAME)-$(VERSION).elf
 
 $(PROG): Makefile $(OBJ) altos-loader.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ao_product.h: ao-make-product.5c $(TOPDIR)/Version
        $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index ede75f80e4745eef929d70923203d631a3a52628..ee1cb6583afd886ac10464f5cdb9e1badea843d6 100644 (file)
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -22,12 +22,10 @@ endif
 include $(TOPDIR)/Makedefs
 
 CC=$(ARM_CC)
-SAT=/opt/cortex
-SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
-SAT_CFLAGS=-I$(SAT)/include
+LIBS=-lpdclib-cortex-m3 -lgcc
 
 AO_CFLAGS=-I. -I../stm -I../core -I../drivers -I..
-STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS) $(SAT_CFLAGS)
+STM_CFLAGS=-std=gnu99 -mlittle-endian -mcpu=cortex-m3 -mthumb -ffreestanding -nostdlib $(AO_CFLAGS)
 
 LDFLAGS=-L../stm -Wl,-Taltos.ld
 
diff --git a/src/telegps-v0.1/Makefile b/src/telegps-v0.1/Makefile
index 64deddc621bbc56c978fbfd6423618133a6e3cf9..170294e6468b08094f796516bcdb41033ec681b8 100644 (file)
--- a/src/telegps-v0.1/Makefile
+++ b/src/telegps-v0.1/Makefile
@@ -82,7 +82,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)
 
diff --git a/src/telegps-v0.3/Makefile b/src/telegps-v0.3/Makefile
index ca7d7c2b14e93d58bdc8735db2df3ab2bca842f4..d129d29503ad9daad0053fa48196f20b68a9a719 100644 (file)
--- a/src/telegps-v0.3/Makefile
+++ b/src/telegps-v0.3/Makefile
@@ -66,7 +66,7 @@ all: $(PROG)
 LDFLAGS=-L../lpc -Wl,-Taltos.ld
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)
 
diff --git a/src/telelco-v0.1/Makefile b/src/telelco-v0.1/Makefile
index 240833082bdf7c7f80dc790856feab4ef88dbd4a..0f61788c6485ee37e7cb7d7fa45e917b22acbc2a 100644 (file)
--- a/src/telelco-v0.1/Makefile
+++ b/src/telelco-v0.1/Makefile
@@ -76,7 +76,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ../altitude.h: make-altitude
        nickle $< > $@
diff --git a/src/telelco-v0.2/Makefile b/src/telelco-v0.2/Makefile
index f78ca9e25f6c06b93d3335b398fd96c945504ba8..bc5f8571969210507b25f7198b11e3d09be6b45f 100644 (file)
--- a/src/telelco-v0.2/Makefile
+++ b/src/telelco-v0.2/Makefile
@@ -85,7 +85,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ../altitude.h: make-altitude
        nickle $< > $@
diff --git a/src/telemega-v0.1/Makefile b/src/telemega-v0.1/Makefile
index bf756e9637e5eacfd758c0dbd1c42d85783589ce..bbf46f3c4c9e49cae8f73f814d78b56a2909e03b 100644 (file)
--- a/src/telemega-v0.1/Makefile
+++ b/src/telemega-v0.1/Makefile
@@ -112,7 +112,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ../altitude-pa.h: make-altitude-pa
        nickle $< > $@
diff --git a/src/telemega-v0.3/Makefile b/src/telemega-v0.3/Makefile
index f2c0625fd4d70e819f736b1033affab0953c44b2..6e5da721db357aca640b4251f228550ab764446a 100644 (file)
--- a/src/telemega-v0.3/Makefile
+++ b/src/telemega-v0.3/Makefile
@@ -112,7 +112,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ../altitude-pa.h: make-altitude-pa
        nickle $< > $@
diff --git a/src/telemetrum-v2.0/Makefile b/src/telemetrum-v2.0/Makefile
index c03a553938aad26fb7f02dc16b3b462eea4c42b3..be72d493b90064428536872e494195f5c9b07abe 100644 (file)
--- a/src/telemetrum-v2.0/Makefile
+++ b/src/telemetrum-v2.0/Makefile
@@ -101,7 +101,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 ../altitude-pa.h: make-altitude-pa
        nickle $< > $@
diff --git a/src/telescience-v0.2/Makefile b/src/telescience-v0.2/Makefile
index f16ef268f416f8551e7ff451e20af3a7e15546a8..c53a6cc3aa24df032188f9dd9bc6ec9f9448ea6c 100644 (file)
--- a/src/telescience-v0.2/Makefile
+++ b/src/telescience-v0.2/Makefile
@@ -68,7 +68,7 @@ OBJ=$(SRC:.c=.o)
 all: $(PROG)
 
 $(PROG): Makefile $(OBJ) altos.ld
-       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+       $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
 
 $(OBJ): $(INC)
 
AltOS - the operating system for Altus Metrum products