X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=5397eab62639ab98d110451432c14841e0fdd9d9;hb=cc5352a4c2c6cc82e72fc360ded634768a625427;hp=89bd2a006c572c05359b2ee2df2fe1c8372508f7;hpb=5ccf82b7feaec1c1fdb5e4cbf1db8a537d8c4419;p=pdclib

diff --git a/Makefile b/Makefile
index 89bd2a0..5397eab 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@ 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 $(PROJDIRS) -type f -name "*.c")
 # All header files of the project
-HDRFILES := $(shell find $(PROJDIRS) -mindepth 1 -maxdepth 3 -name "*.h")
+HDRFILES := $(shell find $(PROJDIRS) -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
@@ -29,18 +29,8 @@ 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 
+CFLAGS := -fno-builtin -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
 
@@ -64,7 +54,6 @@ pdclib.a: $(OBJFILES)
 	@echo
 
 test: functions/$(FILE)
-	echo $(TSTDEPFILES)
 	functions/$(FILE)
 
 tests: testdrivers
@@ -79,10 +68,10 @@ 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)
@@ -98,20 +87,11 @@ 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 file in $$(find platform/$(PLATFORM) -mindepth 2 -type f ! -path *.svn* -printf "%P\n"); do ln -s $$(dirname $$file | sed "s@[^/]*@..@g")/platform/$(PLATFORM)/$$file $$file; 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 $$dir -type l -exec rm {} +; done
 
 help:
 	@echo "Available make targets:"