commit 1f7beb9181acf0f18d37449bb209e92a12572015
parent fe1706ed5d92e9f3e8f7b5013291d33622bdffd5
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Fri,  2 Jan 2015 20:22:49 +0100

remove mkfile, update README

Diffstat:
DCREDITS | 2--
MMakefile | 1-
MREADME | 20+++++++++-----------
Mconfig.mk | 4++--
Dmkfile | 23-----------------------
5 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/CREDITS b/CREDITS @@ -1,2 +0,0 @@ -- raph_ael on #suckless for the idea for an OPML converter. -- dpb on #suckless for helping improve the plan9 mkfile. diff --git a/Makefile b/Makefile @@ -39,7 +39,6 @@ MAN1 = \ sfeed_xmlenc.1 DOC = \ CHANGELOG\ - CREDITS\ LICENSE\ README\ README.xml\ diff --git a/README b/README @@ -14,7 +14,7 @@ Dependencies Optional dependencies --------------------- -- make (for Makefile) or mk (for mkfile) (plan9 or 9base). +- make (for Makefile). - POSIX shell used by sfeed_update and sfeed_opml_export. - curl binary: http://curl.haxx.se/ @@ -42,15 +42,17 @@ Files sfeed - Binary (from sfeed.c); read XML RSS or Atom feed data from stdin. Write feed data in tab-separated format to stdout. -sfeed_update - Shellscript; update feeds and merge with old feeds in the - file $HOME/.sfeed/feeds by default. -sfeed_plain - Format feeds file (TSV) from sfeed_update to plain text. sfeed_html - Format feeds file (TSV) from sfeed_update to HTML. sfeed_frames - Format feeds as a HTML file with frames. sfeed_opml_import - Generate a sfeedrc config file based on an opml file. sfeed_opml_export - Generate an opml file based on a sfeedrc config file. -sfeed_xmlenc - Detect character-set encoding from XML stream. +sfeed_plain - Format feeds file (TSV) from sfeed_update to plain text. +sfeed_stats - Format feeds file to show a summary listing of the total + amount, new amount and timestamp of the latest item. +sfeed_update - Shellscript; update feeds and merge with old feeds in the + file $HOME/.sfeed/feeds by default. sfeed_web - Find urls to RSS/Atom feed from a webpage. +sfeed_xmlenc - Detect character-set encoding from XML stream. sfeedrc.example - Example config file. style.css - Example stylesheet to use with sfeed_html and sfeed_frames. @@ -105,14 +107,10 @@ item baseurl site - string (extra field added by sfeed_update) Build and install ----------------- -Using make (respects DESTDIR and PREFIX variable): +Using make (respects $DESTDIR and $PREFIX): make install -or using plan9 mk: - -mk install - Usage ----- @@ -157,7 +155,7 @@ sfeed_opml_import < opmlfile.xml > $HOME/.sfeed/sfeedrc Export an opml file of your feeds from a sfeedrc config file (configfile -arguments is optional): +argument is optional): sfeed_opml_export configfile > myfeeds.opml diff --git a/config.mk b/config.mk @@ -27,9 +27,9 @@ LDFLAGS = ${LIBS} #LDFLAGS = -static -s ${LIBS} # uncomment for compat -CFLAGS += -DCOMPAT +#CFLAGS += -DCOMPAT # uncomment if your libc doesn't support strlcpy -EXTRAOBJ = strlcpy.o +#EXTRAOBJ = strlcpy.o # compiler and linker #CC = cc diff --git a/mkfile b/mkfile @@ -1,23 +0,0 @@ -CC = cc - -<config.mk - -TARG = sfeed sfeed_html sfeed_frames sfeed_plain sfeed_stats sfeed_web \ - sfeed_xmlenc sfeed_opml_import - -all: $TARG - - -clean: - rm -f *.o core a.out $TARG - -sfeed: xml.o -sfeed_opml_import: xml.o -sfeed_web: xml.o -sfeed_xmlenc: xml.o - -&: &.o util.o - $CC $prereq -o $target - -&.o: &.c - $CC $CFLAGS -c $stem.c