Add support for building multiple architectures

This builds cortex-m3 and cortex-m0 libraries, installing them with
separate names.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/Makefile b/Makefile
index 2afbc20d5b43b7056533ba6aec0ad1a064ddf842..84e3393f18ad406237f4c68e5c3c8b166ba46b42 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,18 @@
 # $Id$
 
 DESTDIR=
-prefix=/home/keithp/sat
+prefix=/opt/sat
 libdir=$(prefix)/lib
+bindir=$(prefix)/bin
 includedir=$(prefix)/include
 
-CC=arm-none-eabi-gcc
+#CPU=cortex-m3
+CPUS=cortex-m0 cortex-m3
+FIRSTCPU=cortex-m0
+CPU=none
+BUILD=build-$(CPU)
+
+CC=$(bindir)/arm-none-eabi-gcc
 
 # This is where you chose which platform to compile for (see 'make links' / './platform')
 PLATFORM := altos
@@ -17,10 +24,10 @@ AUXFILES := Makefile Readme.txt
 PROJDIRS := functions includes internals
 # All source files of the project
 SRCFILES := $(shell find -L $(PROJDIRS) -type f -name "*.c")
-BUILDFILES := $(shell find -L build -type f -name "*.c")
+BUILDFILES := $(shell find -L $(BUILD) -type f -name "*.c")
 # All header files of the project
 HDRFILES := $(shell find -L $(PROJDIRS) -type f -name "*.h")
-BUILDHDRFILES := $(shell find -L build -type f -name "*.h")
+BUILDHDRFILES := $(shell find -L $(BUILD) -type f -name "*.h")
 # All .c files in functions/_PDCLIB that do not have a regression test driver
 INTFILES := _Exit atomax digits open print scan remove rename seed stdinit strtox_main strtox_prelim filemode eol errno seek prepread prepwrite allocpages tmpfilename closeall
 # All object files in the library
@@ -40,11 +47,20 @@ ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
 WARNINGS := -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wuninitialized -Wstrict-prototypes 
 PLATFORM_FLAGS=-nostdinc -mlittle-endian -mthumb -mcpu=cortex-m3 -ffreestanding -nostdlib
-CFLAGS := -fno-builtin -Os -g -std=c99 -I./build/internals -I./testing $(WARNINGS) $(USERFLAGS) $(PLATFORM_FLAGS)
+CFLAGS := -fno-builtin -Os -g -std=c99 -I./$(BUILD)/internals -I./testing $(WARNINGS) $(USERFLAGS) $(PLATFORM_FLAGS)
 
 .PHONY: all clean srcdist bindist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
 
-all: pdclib.a
+PDCLIB=pdclib-$(CPU).a
+
+all:
+       +for i in $(CPUS); do make CPU=$$i links pdclib-$$i.a; done
+
+install: install-hdr
+       +for i in $(CPUS); do make CPU=$$i install-lib-$$i; done
+
+install-hdr:
+       +make CPU=$(FIRSTCPU) install-hdr-$(FIRSTCPU)
 
 check: all testdrivers regtestdrivers
        @echo
@@ -60,17 +76,17 @@ check: all testdrivers regtestdrivers
        @echo
        @$(MAKE) regtests | grep -v "^ RTST" | grep -v "^Failed"
 
-pdclib.a: $(OBJFILES)
+$(PDCLIB): $(BUILD) $(OBJFILES)
        @echo " AR      $@"
-       @ar rc pdclib.a $?
+       @ar rc $@ $(OBJFILES)
        @echo
 
-install: install-lib install-hdr
+install-$(CPU): install-$(CPU)-lib install-hdr
 
-install-lib: pdclib.a
-       install -D -c pdclib.a $(DESTDIR)$(libdir)/pdclib.a
+install-lib-$(CPU): $(BUILD) $(PDCLIB)
+       install -D -c $(PDCLIB) $(DESTDIR)$(libdir)/$(PDCLIB)
 
-install-hdr: $(BUILDHDRFILES)
+install-hdr-$(CPU): $(BUILD) $(BUILDHDRFILES)
        for file in $(BUILDHDRFILES); do \
                install -D -c $$file $(DESTDIR)$(includedir)/.; \
        done
@@ -92,8 +108,8 @@ regtestdrivers: $(REGFILES)
 
 -include $(DEPFILES) $(TSTDEPFILES) $(REGDEPFILES)
 
-clean:
-       -@$(RM) $(wildcard $(OBJFILES) $(DEPFILES) $(TSTFILES) $(TSTDEPFILES) $(REGFILES) $(REGDEPFILES) pdclib.a pdclib.tgz scanf_testdata_*)
+clean: $(BUILD)
+       -@$(RM) $(wildcard $(OBJFILES) $(DEPFILES) $(TSTFILES) $(TSTDEPFILES) $(REGFILES) $(REGDEPFILES) $(PDCLIB) pdclib.tgz scanf_testdata_*)
 
 srcdist:
        @tar czf pdclib.tgz $(ALLFILES)
@@ -107,24 +123,24 @@ fixmes:
 find:
        @find functions/ includes/ internals/ platform/ -name "*\.[ch]" -type f | xargs grep $$FIND
 
-links:
+links: $(BUILD)
        @echo "Linking platform/$(PLATFORM)..."
-       @for dir in $$(find functions includes internals -type d); do mkdir -p build/$$dir; done
-       @for file in $$(find platform/$(PLATFORM) -mindepth 2 -type f ! -path *.svn* -printf "%P\n"); do if [ ! -f build/$$file ]; then ln -s $$(dirname $$file | sed "s@[^/]*@..@g")/../platform/$(PLATFORM)/$$file build/$$file; fi; done
-       @for super in $(PROJDIRS); do for file in $$(find $$super -type f ! -path *.svn* -printf "%P\n"); do if [ ! -f build/$$super/$$file ]; then ln -s $$(echo $$file | sed "s@[^/]*@..@g")/../$$super/$$file build/$$super/$$file; fi; done; done
+       @for dir in $$(find functions includes internals -type d); do mkdir -p $(BUILD)/$$dir; done
+       @for file in $$(find platform/$(PLATFORM) -mindepth 2 -type f ! -path *.svn* -printf "%P\n"); do if [ ! -f $(BUILD)/$$file ]; then ln -s $$(dirname $$file | sed "s@[^/]*@..@g")/../platform/$(PLATFORM)/$$file $(BUILD)/$$file; fi; done
+       @for super in $(PROJDIRS); do for file in $$(find $$super -type f ! -path *.svn* -printf "%P\n"); do if [ ! -f $(BUILD)/$$super/$$file ]; then ln -s $$(echo $$file | sed "s@[^/]*@..@g")/../$$super/$$file $(BUILD)/$$super/$$file; fi; done; done
 
-unlink:
+unlink: $(BUILD)
        @echo "Unlinking platform files..."
-       @for dir in $(PROJDIRS); do find build/$$dir -type l -exec rm {} +; done
+       @for dir in $(PROJDIRS); do find $(BUILD)/$$dir -type l -exec rm {} +; done
 
 help:
        @echo "Available make targets:"
        @echo
-       @echo "all              - build pdclib.a"
+       @echo "all              - build $(PDCLIB)"
        @echo "clean            - remove all object files, dependency files and test drivers"
        @echo "srcdist          - build pdclib.tgz (source tarball)"
        @echo "test             - test a single testdriver (Usage: FILE=\"test.[rt]\" make test)"
-       @echo "tests            - build and run test drivers (link pdclib.a)"
+       @echo "tests            - build and run test drivers (link $(PDCLIB))"
        @echo "  testdrivers    - build but do not run test drivers"
        @echo "regtests         - build and run regression test drivers (link system clib)"
        @echo "  regtestdrivers - build but do not run regression test drivers"
@@ -143,13 +159,15 @@ help:
 
 %.o: %.c Makefile
        echo " CC       $(patsubst functions/%,%,$@)"
-       $(CC) $(CFLAGS) -MMD -MP -I./build/includes -c $< -o $@
+       $(CC) $(CFLAGS) -MMD -MP -I./$(BUILD)/includes -c $< -o $@
 
-%_t: %.c Makefile pdclib.a
+%_t: %.c Makefile $(PDCLIB)
        @echo " CC      $(patsubst functions/%,%,$@)"
-       @$(CC) $(CFLAGS) -MMD -MP -DTEST -I./build/includes $< pdclib.a -o $@
+       @$(CC) $(CFLAGS) -MMD -MP -DTEST -I./$(BUILD)/includes $< $(PDCLIB) -o $@
 
 %_r: %.c Makefile
        @echo " CC      $(patsubst functions/%,%,$@)"
        @$(CC) $(CFLAGS) -MMD -MP -DTEST -DREGTEST $< -o $@
 
+$(BUILD):
+       mkdir -p $(BUILD)
\ No newline at end of file