X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=6d6b8f8faee9c8a72b79f1da6346ddf39f839c7f;hb=f45c718f9ede10c96fd2a9e409122e0ff76d49e5;hp=afd9eb58648a37f686372a3d791a9f4b343c681e;hpb=a8e176acb89dbccda65b7d1e757fcfc41d674190;p=fw%2Fpdclib

diff --git a/Makefile b/Makefile
index afd9eb5..6d6b8f8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,21 @@
 # $Id$
 
+DESTDIR=
+prefix=/opt/cortex
+libdir=$(prefix)/lib
+bindir=$(prefix)/bin
+includedir=$(prefix)/include
+
+#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 := example
+PLATFORM := altos
 
 # This is a list of all non-source files that are part of the distribution.
 AUXFILES := Makefile Readme.txt
@@ -9,35 +23,50 @@ AUXFILES := Makefile Readme.txt
 # Directories belonging to the project
 PROJDIRS := functions includes internals
 # All source files of the project
-SRCFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.c")
+SRCFILES := $(shell find -L $(PROJDIRS) -type f -name "*.c")
+BUILDFILES := $(shell find -L $(BUILD) -type f -name "*.c")
 # All header files of the project
-HDRFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.h")
+HDRFILES := $(shell find -L $(PROJDIRS) -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
+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
-OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
+OBJFILES := $(patsubst %.c,%.o,$(BUILDFILES))
 # All test drivers (.t)
-TSTFILES := $(patsubst %.c,%.t,$(SRCFILES))
+TSTFILES := $(patsubst %.c,%_t,$(SRCFILES))
 # All regression test drivers (.r)
-REGFILES := $(filter-out $(patsubst %,functions/_PDCLIB/%.r,$(INTFILES)),$(patsubst %.c,%.r,$(SRCFILES)))
-# All dependency files (.d)
+REGFILES := $(filter-out $(patsubst %,functions/_PDCLIB/%_r,$(INTFILES)),$(patsubst %.c,%_r,$(SRCFILES)))
+# All library dependency files (.d)
 DEPFILES := $(patsubst %.c,%.d,$(SRCFILES))
+# All test driver dependency files (_t.d)
+TSTDEPFILES := $(patsubst %,%.d,$(TSTFILES))
+# All regression test driver dependency files (_r.d)
+REGDEPFILES := $(patsubst %,%.d,$(REGFILES))
 # All files belonging to the source distribution
 ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
-# All files in platform/$(PLATFORM)/functions/_PDCLIB (for development only)
-PATCHFILES1 := $(shell ls platform/$(PLATFORM)/functions/_PDCLIB/*.c)
-# All files in platform/$(PLATFORM)/functions/stdlib (for development only)
-PATCHFILES2 := $(shell ls platform/$(PLATFORM)/functions/stdlib/*.c)
-# All files in platform/$(PLATFORM)/functions/stdio (for development only)
-PATCHFILES3 := $(shell ls platform/$(PLATFORM)/functions/stdio/*.c)
-
-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 -fno-builtin 
-CFLAGS := -g -std=c99 -I./internals $(WARNINGS) $(USERFLAGS)
+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=$(CPU) -ffreestanding -nostdlib
+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 testdrivers regtestdrivers
+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)
+
+clean:
+	+for i in $(CPUS); do make CPU=$$i clean-$$i; rm -rf build-$$i; done
+	rm pdclib.a
+
+check: all testdrivers regtestdrivers
 	@echo
 	@echo "========================"
 	@echo "Executing library tests:"
@@ -51,11 +80,21 @@ all: pdclib.a 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-$(CPU): install-$(CPU)-lib install-hdr
+
+install-lib-$(CPU): $(BUILD) $(PDCLIB)
+	install -D -c $(PDCLIB) $(DESTDIR)$(libdir)/$(PDCLIB)
+
+install-hdr-$(CPU): $(BUILD) $(BUILDHDRFILES)
+	for file in $(BUILDHDRFILES); do \
+		install -D -c $$file $(DESTDIR)$(includedir)/.; \
+	done
+
 test: functions/$(FILE)
 	functions/$(FILE)
 
@@ -71,47 +110,41 @@ regtests: regtestdrivers
 regtestdrivers: $(REGFILES)
 	@echo
 
--include $(DEPFILES)
+-include $(DEPFILES) $(TSTDEPFILES) $(REGDEPFILES)
 
-clean:
-	@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(REGFILES) pdclib.a pdclib.tgz; do if [ -f $$file ]; then rm $$file; fi; done
+clean-$(CPU): $(BUILD)
+	-@$(RM) $(wildcard $(OBJFILES) $(DEPFILES) $(TSTFILES) $(TSTDEPFILES) $(REGFILES) $(REGDEPFILES) $(PDCLIB) pdclib.tgz scanf_testdata_*)
 
 srcdist:
 	@tar czf pdclib.tgz $(ALLFILES)
 
 todos:
-	-@for file in $(ALLFILES); do grep -H TODO $$file; done; true
+	-@for file in $(ALLFILES:Makefile=); do grep -H TODO $$file; done; true
 
 fixmes:
-	-@for file in $(ALLFILES); do grep -H FIXME $$file; done; true
+	-@for file in $(ALLFILES:Makefile=); do grep -H FIXME $$file; done; true
 
 find:
 	@find functions/ includes/ internals/ platform/ -name "*\.[ch]" -type f | xargs grep $$FIND
 
-links:
+links: $(BUILD)
 	@echo "Linking platform/$(PLATFORM)..."
-	@cd internals && ln -s ../platform/$(PLATFORM)/internals/_PDCLIB_config.h
-	@cd includes && ln -s ../platform/$(PLATFORM)/includes/float.h
-	@cd functions/_PDCLIB && for file in $(PATCHFILES1); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
-	@cd functions/stdlib && for file in $(PATCHFILES2); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; done
-	@cd functions/stdio && for file in $(PATCHFILES3); do basfile=`basename $$file`; if [ ! -f $$basfile ]; then ln -s `ls ../../$$file` .; fi; 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..."
-	@if [ -f internals/_PDCLIB_config.h ]; then rm internals/_PDCLIB_config.h; fi
-	@if [ -f includes/float.h ]; then rm includes/float.h; fi
-	@cd functions/_PDCLIB && for file in $(PATCHFILES1); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done
-	@cd functions/stdlib && for file in $(PATCHFILES2); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; done
-	@cd functions/stdio && for file in $(PATCHFILES3); do basfile=`basename $$file`; if [ -f $$basfile ]; then rm $$basfile; fi; 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"
@@ -129,14 +162,16 @@ help:
 	@echo "(Usage: USERFLAGS=\"flags\" make [...])."
 
 %.o: %.c Makefile
-	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -MMD -MP -MT "$*.d $*.t" -I./includes -c $< -o $@
+	echo " CC	$(patsubst functions/%,%,$@)"
+	$(CC) $(CFLAGS) -MMD -MP -I./$(BUILD)/includes -c $< -o $@
 
-%.t: %.c Makefile pdclib.a
+%_t: %.c Makefile $(PDCLIB)
 	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -DTEST -I./includes $< pdclib.a -o $@
+	@$(CC) $(CFLAGS) -MMD -MP -DTEST -I./$(BUILD)/includes $< $(PDCLIB) -o $@
 
-%.r: %.c Makefile
+%_r: %.c Makefile
 	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -Wno-format -DTEST -DREGTEST $< -o $@
+	@$(CC) $(CFLAGS) -MMD -MP -DTEST -DREGTEST $< -o $@
 
+$(BUILD):
+	mkdir -p $(BUILD)