X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=2afbc20d5b43b7056533ba6aec0ad1a064ddf842;hb=4348b127b85c6d8f8fb870635c30a42bfa20d689;hp=89bd2a006c572c05359b2ee2df2fe1c8372508f7;hpb=15fad80eee0f60bf0e83cc3622f4b4ed275ea8f8;p=fw%2Fpdclib

diff --git a/Makefile b/Makefile
index 89bd2a0..2afbc20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,14 @@
 # $Id$
 
+DESTDIR=
+prefix=/home/keithp/sat
+libdir=$(prefix)/lib
+includedir=$(prefix)/include
+
+CC=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,13 +16,15 @@ 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 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))
 # All regression test drivers (.r)
@@ -29,22 +38,15 @@ REGDEPFILES := $(patsubst %,%.d,$(REGFILES))
 # All files belonging to the source distribution
 ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
 
-# TODO: This must be possible without four discrete steps.
-# 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)
-# All files in platform/$(PLATFORM)/functions/signal (for development only)
-PATCHFILES4 := $(shell ls platform/$(PLATFORM)/functions/signal/*.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 -I./testing $(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=cortex-m3 -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
+all: pdclib.a
+
+check: all testdrivers regtestdrivers
 	@echo
 	@echo "========================"
 	@echo "Executing library tests:"
@@ -63,8 +65,17 @@ pdclib.a: $(OBJFILES)
 	@ar rc pdclib.a $?
 	@echo
 
+install: install-lib install-hdr
+
+install-lib: pdclib.a
+	install -D -c pdclib.a $(DESTDIR)$(libdir)/pdclib.a
+
+install-hdr: $(BUILDHDRFILES)
+	for file in $(BUILDHDRFILES); do \
+		install -D -c $$file $(DESTDIR)$(includedir)/.; \
+	done
+
 test: functions/$(FILE)
-	echo $(TSTDEPFILES)
 	functions/$(FILE)
 
 tests: testdrivers
@@ -79,39 +90,32 @@ regtests: regtestdrivers
 regtestdrivers: $(REGFILES)
 	@echo
 
-#-include $(DEPFILES) $(TSTDEPFILES) $(REGDEPFILES)
+-include $(DEPFILES) $(TSTDEPFILES) $(REGDEPFILES)
 
 clean:
-	@for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(TSTDEPFILES) $(REGFILES) $(REGDEPFILES) pdclib.a pdclib.tgz scanf_testdata_*; do if [ -f $$file ]; then rm $$file; fi; done
+	-@$(RM) $(wildcard $(OBJFILES) $(DEPFILES) $(TSTFILES) $(TSTDEPFILES) $(REGFILES) $(REGDEPFILES) pdclib.a 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:
 	@echo "Linking platform/$(PLATFORM)..."
-	@cd internals && ln -s ../platform/$(PLATFORM)/internals/_PDCLIB_config.h
-	@cd includes && ln -s ../platform/$(PLATFORM)/includes/float.h && ln -s ../platform/$(PLATFORM)/includes/signal.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
-	@cd functions/signal && for file in $(PATCHFILES4); 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:
 	@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:"
@@ -138,12 +142,12 @@ help:
 	@echo "(Usage: USERFLAGS=\"flags\" make [...])."
 
 %.o: %.c Makefile
-	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -MMD -MP -I./includes -c $< -o $@
+	echo " CC	$(patsubst functions/%,%,$@)"
+	$(CC) $(CFLAGS) -MMD -MP -I./build/includes -c $< -o $@
 
 %_t: %.c Makefile pdclib.a
 	@echo " CC	$(patsubst functions/%,%,$@)"
-	@$(CC) $(CFLAGS) -MMD -MP -DTEST -I./includes $< pdclib.a -o $@
+	@$(CC) $(CFLAGS) -MMD -MP -DTEST -I./build/includes $< pdclib.a -o $@
 
 %_r: %.c Makefile
 	@echo " CC	$(patsubst functions/%,%,$@)"