projects
/
fw
/
pdclib
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Proper handling of dependencies. (Related to #26.)
[fw/pdclib]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 6abc6967a811349a8c127c8160cccad982dba444..09d02ec90e51faa14753a60fcdfd5e985af044da 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-13,15
+13,19
@@
SRCFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.c")
# All header files of the project
HDRFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.h")
# All .c files in functions/_PDCLIB that do not have a regression test driver
# All header files of the project
HDRFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -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
cleanstream fflush filemode eol errno seek prepread prepwrite allocpages
+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))
# All test drivers (.t)
# All object files in the library
OBJFILES := $(patsubst %.c,%.o,$(SRCFILES))
# All test drivers (.t)
-TSTFILES := $(patsubst %.c,%
.
t,$(SRCFILES))
+TSTFILES := $(patsubst %.c,%
_
t,$(SRCFILES))
# All regression test drivers (.r)
# 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))
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 belonging to the source distribution
ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES)
@@
-33,7
+37,7
@@
PATCHFILES2 := $(shell ls platform/$(PLATFORM)/functions/stdlib/*.c)
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
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)
+CFLAGS := -g -std=c99 -I./internals
-I./testing
$(WARNINGS) $(USERFLAGS)
.PHONY: all clean srcdist bindist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
.PHONY: all clean srcdist bindist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help
@@
-71,10
+75,12
@@
regtests: regtestdrivers
regtestdrivers: $(REGFILES)
@echo
regtestdrivers: $(REGFILES)
@echo
-
-include $(
DEPFILES)
+
#-include $(DEPFILES) $(TSTDEPFILES) $(REG
DEPFILES)
clean:
clean:
- @for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(REGFILES) pdclib.a pdclib.tgz; do if [ -f $$file ]; then rm $$file; fi; done
+ echo $(TSTFILES)
+ echo $(TSTDEPFILES)
+ @for file in $(OBJFILES) $(DEPFILES) $(TSTFILES) $(TSTDEPFILES) $(REGFILES) $(REGDEPFILES) pdclib.a pdclib.tgz scanf_testdata_*; do if [ -f $$file ]; then rm $$file; fi; done
srcdist:
@tar czf pdclib.tgz $(ALLFILES)
srcdist:
@tar czf pdclib.tgz $(ALLFILES)
@@
-92,6
+98,7
@@
links:
@echo "Linking platform/$(PLATFORM)..."
@cd internals && ln -s ../platform/$(PLATFORM)/internals/_PDCLIB_config.h
@cd includes && ln -s ../platform/$(PLATFORM)/includes/float.h
@echo "Linking platform/$(PLATFORM)..."
@cd internals && ln -s ../platform/$(PLATFORM)/internals/_PDCLIB_config.h
@cd includes && ln -s ../platform/$(PLATFORM)/includes/float.h
+ @cd testing && ln -s ../platform/$(PLATFORM)/testing/printf_reference.txt
@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/_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
@@
-100,6
+107,7
@@
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
@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
+ @if [ -f testing/printf_reference.txt ]; then rm testing/printf_reference.txt; 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
@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
@@
-130,13
+138,13
@@
help:
%.o: %.c Makefile
@echo " CC $(patsubst functions/%,%,$@)"
%.o: %.c Makefile
@echo " CC $(patsubst functions/%,%,$@)"
- @$(CC) $(CFLAGS) -MMD -MP -
MT "$*.d $*.t" -
I./includes -c $< -o $@
+ @$(CC) $(CFLAGS) -MMD -MP -I./includes -c $< -o $@
-%
.
t: %.c Makefile pdclib.a
+%
_
t: %.c Makefile pdclib.a
@echo " CC $(patsubst functions/%,%,$@)"
@echo " CC $(patsubst functions/%,%,$@)"
- @$(CC) $(CFLAGS) -DTEST -I./includes $< pdclib.a -o $@
+ @$(CC) $(CFLAGS) -
MMD -MP -
DTEST -I./includes $< pdclib.a -o $@
-%
.
r: %.c Makefile
+%
_
r: %.c Makefile
@echo " CC $(patsubst functions/%,%,$@)"
@echo " CC $(patsubst functions/%,%,$@)"
- @$(CC) $(CFLAGS) -
Wno-format
-DTEST -DREGTEST $< -o $@
+ @$(CC) $(CFLAGS) -
MMD -MP
-DTEST -DREGTEST $< -o $@