commit ab093b6aefb19777d31f008b0a841c0522a2ba9e from: Omar Polo date: Sat Jul 24 08:28:50 2021 UTC use proper path (out-of-tree builds) and include pages/*.gmi commit - 4dff850def86f961eeee65286e0ec2444a80f9ec commit + ab093b6aefb19777d31f008b0a841c0522a2ba9e blob - 9f846385379521570ddf7ba5da8b00282de04d17 blob + 7145968c1d58b0218f4a4c85d124a4e76b195126 --- Makefile.am +++ Makefile.am @@ -51,7 +51,7 @@ CLEANFILES = cmd.gen.c compile_flags.txt emoji-matche LDADD = $(LIBOBJS) -EXTRA_DIST = ChangeLog LICENSE README.md data/emoji.txt +EXTRA_DIST = ChangeLog LICENSE README.md data/emoji.txt pages/*.gmi dist_man1_MANS = telescope.1 @@ -59,23 +59,24 @@ cmd.gen.c: $(srcdir)/cmd.h $(srcdir)/gencmd.awk ${AWK} -f $(srcdir)/gencmd.awk < $(srcdir)/cmd.h > $@ emoji-matcher.c: $(srcdir)/data/emoji.txt $(srcdir)/gen-emoji-matcher.sh - $(srcdir)/gen-emoji-matcher.sh > $@ + $(srcdir)/gen-emoji-matcher.sh $(srcdir)/data/emoji.txt > $@ compile_flags.txt: printf "%s\n" ${CFLAGS} > compile_flags.txt -PAGES = pages/about_about.gmi \ - pages/about_blank.gmi \ - pages/about_help.gmi \ - pages/about_license.gmi \ - pages/about_new.gmi +PAGES = $(srcdir)/pages/about_about.gmi \ + $(srcdir)/pages/about_blank.gmi \ + $(srcdir)/pages/about_crash.gmi \ + $(srcdir)/pages/about_help.gmi \ + $(srcdir)/pages/about_license.gmi \ + $(srcdir)/pages/about_new.gmi pages.c: pagebundler $(srcdir)/pages.h ${PAGES} echo > $@ echo "#include \"pages.h\"" >> $@ ./pagebundler -f $(srcdir)/pages/about_about.gmi -v about_about >> $@ ./pagebundler -f $(srcdir)/pages/about_blank.gmi -v about_blank >> $@ + ./pagebundler -f $(srcdir)/pages/about_crash.gmi -v about_crash >> $@ ./pagebundler -f $(srcdir)/pages/about_help.gmi -v about_help >> $@ ./pagebundler -f $(srcdir)/pages/about_license.gmi -v about_license >> $@ ./pagebundler -f $(srcdir)/pages/about_new.gmi -v about_new >> $@ - ./pagebundler -f $(srcdir)/pages/about_crash.gmi -v about_crash >> $@ ./pagebundler -f $(srcdir)/pages/bookmarks.gmi -v bookmarks >> $@ blob - 8ba643483af9ac89a8a7b101d773b406c2970467 blob + ca50652b0a1fd5cc7aea6f54e7adc93b40f2e786 --- gen-emoji-matcher.sh +++ gen-emoji-matcher.sh @@ -1,11 +1,13 @@ #!/bin/sh +file="${1:?missing input file}" + sed -e '/^$/d' \ -e '/^#/d' \ -e 's/;.*//' \ -e 's/[ \t]*$//' \ -e 's/\.\./ /' \ - data/emoji.txt \ + "$file" \ | awk ' BEGIN { print "#include \"utf8.h\""