From bd9ffcf233e805a12780c6f9a865f734afeda1d8 Mon Sep 17 00:00:00 2001 From: Laurent MAZET Date: Wed, 9 Oct 2024 11:36:15 +0200 Subject: [PATCH] remove perl script from makefile --- bf.c | 2 ++ getcomments.pl | 85 -------------------------------------------------- makefile | 51 ++++++++++++++++++++---------- 3 files changed, 36 insertions(+), 102 deletions(-) delete mode 100644 getcomments.pl diff --git a/bf.c b/bf.c index 552c5b0..be16220 100644 --- a/bf.c +++ b/bf.c @@ -1,6 +1,8 @@ /* depend: */ /* cflags: */ /* linker: debug.o */ +/* winlnk: debug.o */ +/* doslnk: debug.o */ #include #include diff --git a/getcomments.pl b/getcomments.pl deleted file mode 100644 index 47edf67..0000000 --- a/getcomments.pl +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/perl - -use strict; - -# default value -my $format = "%"; -my $pattern = ""; - -# help message -sub usage() { - - print <) { - my $cmt; - - # process c++ comments - ($cmt, $_) = m{//\s*(.*?)\s*$()} if (m{//} && !m{/\*.*//}); - - # process standard c comments - ($cmt, $_) = m{^.*?/\*\s*(.*?)\s*\*/(.*)}s if (m{/\*.*\*/}s); - - push(@comments, $cmt) if ($cmt); - - # empty buffer if no comment is present - undef($_) if (!m{/[/*]}); - } - - # close file - close (IN); - - # display comment blocks - foreach my $block (@comments) { - if (($block) = ($block =~ /$pattern(.*)/s)) { - ($_ = $format) =~ s/%/$block/gs; - print "$_\n"; - } - } -} diff --git a/makefile b/makefile index dcf51e3..dfe04ea 100644 --- a/makefile +++ b/makefile @@ -11,15 +11,25 @@ OFLAGS = -O4 -Os #OFLAGS += -minline-all-stringops -fsingle-precision-constant #OFLAGS += -malign-double CFLAGS += -W -Wall -Wextra -g -#CFLAGS += -std=c99 -D_XOPEN_SOURCE=500 CFLAGS += $(OFLAGS) $(INCLUDES) $(OPTIONS) -LDFLAGS += -g $(OPTIONS) - -ifeq ($(OS),Windows_NT) -#LDLIBS += -lws2_32 +LDFLAGS += -g $(LDOPTS) $(OPTIONS) + +LDOPT = linker +MV = mv +ifneq (, $(findstring linux, $(MAKE_HOST))) +# Linux +else ifneq (, $(findstring mingw, $(MAKE_HOST))) +# Windows MinGw +LDOPT = winlnk +else ifneq (, $(findstring cygwin, $(MAKE_HOST))) +# Windows CygWin +LDOPT = winlnk +else ifneq (, $(findstring msdos, $(MAKE_HOST))) +# MSDOS +LDOPT = doslnk +MV = move endif - # Targets ALLEXE = @@ -44,6 +54,9 @@ INSTALL = test -d `dirname $(2)` || $(call MKDIR, `dirname $(2)`) && cp -pa $(1) VALID = $(call TITLE, $(1)) && $(2) && $(call PASS, SUCCESS) || { $(call FAIL, FAILED); test; } +GETCOMMENTS = awk '/\/\*\s*$(1):/,/\*\// { sub(/.*\/\*\s*$(1):/, ""); sub (/\s*\*\/.*/, ""); print } /\/\/\s*$(1):/ {sub (/.*\/\/\s*$(1):/, ""); print }' $(2) +#GETCOMMENTS = perl -- getcomments.pl -p='$(1):\s' -f='%' $(2) + ## Generic rules all: depends @@ -55,7 +68,7 @@ count: clean: $(call TITLE, "Cleaning") touch clean - rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_* gmon.out) + rm -f clean $(wildcard *.d *.ld *.log *.o *.test *~ .exec_* gmon.out _) $(call PASS, SUCCESS) depends: $(patsubst %.c, %.d, $(wildcard *.c)) $(patsubst %, %.ld, $(ALLEXE)) @@ -72,7 +85,8 @@ purge: clean rm -f purge $(ALLEXE:%=%.exe) $(call PASS, SUCCESS) -valgrinds: all +valgrinds: + $(MAKE) all $(MAKE) $(addprefix valgrind_,$(ALLEXE)) wipe: purge @@ -81,7 +95,9 @@ wipe: purge rm -f wipe $(wildcard *.gcda *.gcno *.gcov *.glog) $(call PASS, SUCCESS) -tests: all +tests: + -rm -f $(ALLEXE) + $(MAKE) all $(MAKE) $(addprefix test_,$(ALLEXE)) ## Main rules @@ -91,7 +107,8 @@ include $(wildcard *.ld) gcov_%: $(MAKE) purge - OPTIONS="-coverage -O0" $(MAKE) + $(MAKE) depends + OPTIONS="-coverage -O0" $(MAKE) ${@:gcov_%=%}.exe $(MAKE) test_$(@:gcov_%=%) gcov `sed -e 's/\.exe:/.c/;s/\.o/.c/g' $(@:gcov_%=%.ld)` touch gcov @@ -120,9 +137,9 @@ gprof_%: %.test: %.c $(call TITLE, "Building $@") -# awk '/\/\* *test:.*\*\// { sub(/^.*\/\* *test: */, ""); sub(/ *\*\/.*$$/, ""); print }' $< > $@ - perl -- getcomments.pl -p='test:\s' -f='%' $< > $@ + $(call GETCOMMENTS,test, $<) > $@ $(call PASS, SUCCESS) + -rm -f _ test_%: %.test %.exe IFS=$$'\n'; RC=0; \ @@ -142,24 +159,24 @@ valgrind_%: %.exe %.d: %.c $(call TITLE, "Building $@") $(CC) $(INCLUDES) -MM $< -o $@~ - echo ${<:.c=.o}: $(shell perl -- getcomments.pl -p='depend:\s' -f='%' $<) >> $@~ - mv $@~ $@ + echo ${<:.c=.o}: $(shell $(call GETCOMMENTS,depends, $<)) >> $@~ + $(MV) $@~ $@ $(call PASS, SUCCESS) %.ld: %.c $(call TITLE, "Building $@") - echo ${<:.c=.exe}: $(shell perl -- getcomments.pl -p='linker:\s' -f='%' $< | awk '{for (i=1;i<=NF;i++) if ($$(i) ~ /.o$$/) printf " %s", $$(i)}') > $@ + echo ${<:.c=.exe}: $(shell $(call GETCOMMENTS,$(LDOPT), $<) | awk '{for (i=1;i<=NF;i++) if ($$(i) ~ /.o$$/) printf " %s", $$(i)}') > $@ $(call PASS, SUCCESS) %.o: %.c $(call TITLE, "Building $@") - $(CC) $(CFLAGS) $(INCLUDES) $(shell perl -- getcomments.pl -p='cflags:\s' -f='%' $<) -c $< -o $@ + $(CC) $(CFLAGS) $(INCLUDES) $(shell $(call GETCOMMENTS,cflags, $<)) -c $< -o $@ $(call PASS, SUCCESS) %.exe: %.o %.d $(call TITLE, "Building $@") - $(CC) $(LDFLAGS) $< $(shell perl -- getcomments.pl -p='linker:\s' -f='%' ${<:.o=.c}) $(LDLIBS) -o $@ + $(CC) $(LDFLAGS) $< $(shell $(call GETCOMMENTS,$(LDOPT), ${<:.o=.c})) $(LDLIBS) -o $@ $(call PASS, SUCCESS) ## Phony -- 2.30.2