From: Andre Noll Date: Mon, 6 Nov 2017 00:27:30 +0000 (+0100) Subject: Merge branch 'refs/heads/t/im-logo' X-Git-Tag: v1.0.0~24 X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=5b1c780d1a3e02a6f64242ef5d8c0a2dc71de3ec;hp=-c Merge branch 'refs/heads/t/im-logo' One commit which changes the way dss.png is built and another one which adds the generated dss.png to .gitignore. * refs/heads/t/im-logo: Add dss.png to .gitignore. Replace dss.dia by a shell script. --- 5b1c780d1a3e02a6f64242ef5d8c0a2dc71de3ec diff --combined .gitignore index 977f1dc,dbf0f47..39db697 --- a/.gitignore +++ b/.gitignore @@@ -1,7 -1,7 +1,8 @@@ Makefile.deps *.[oa] cmdline.[ch] +dss.lsg.* dss dss.1 dss.1.html + dss.png diff --combined Makefile index a8e045c,bf8092a..f5c34af --- a/Makefile +++ b/Makefile @@@ -1,67 -1,51 +1,67 @@@ -dss_objects := cmdline.o dss.o str.o file.o exec.o sig.o daemon.o df.o tv.o snap.o ipc.o -all: dss +PREFIX ?= /usr/local +INSTALL ?= install +INSTALL_PROGRAM ?= $(INSTALL) +INSTALL_DATA ?= $(INSTALL) -m 644 +MKDIR_P := mkdir -p + +VERSION_STRING = 0.1.7 + +dss_objects := dss.o str.o file.o exec.o sig.o daemon.o df.o tv.o snap.o ipc.o dss.lsg.o +all: dss dss.1 man: dss.1 -DEBUG_CFLAGS ?= -DEBUG_CFLAGS += -Wno-sign-compare -g -Wunused -Wundef -DEBUG_CFLAGS += -Wredundant-decls -CFLAGS ?= -CFLAGS += -Os -CFLAGS += -Wall -CFLAGS += -Wuninitialized -CFLAGS += -Wchar-subscripts -CFLAGS += -Wformat-security -CFLAGS += -Werror-implicit-function-declaration -CFLAGS += -Wmissing-format-attribute -CFLAGS += -Wunused-macros -CFLAGS += -Wunused-parameter -CFLAGS += -Wbad-function-cast -CFLAGS += -Wshadow +DSS_CPPFLAGS := -DVERSION_STRING='"$(VERSION_STRING)"' +DSS_CPPFLAGS += -Wunused-macros + +DSS_CFLAGS := -Wno-sign-compare -g -Wunused -Wundef +DSS_CFLAGS += -Wredundant-decls +DSS_CFLAGS += -Os +DSS_CFLAGS += -Wall +DSS_CFLAGS += -Wuninitialized +DSS_CFLAGS += -Wchar-subscripts +DSS_CFLAGS += -Wformat-security +DSS_CFLAGS += -Werror-implicit-function-declaration +DSS_CFLAGS += -Wmissing-format-attribute +DSS_CFLAGS += -Wunused-parameter +DSS_CFLAGS += -Wbad-function-cast +DSS_CFLAGS += -Wshadow Makefile.deps: $(wildcard *.c *.h) - gcc -MM -MG *.c > $@ + $(CC) -MM -MG $(DSS_CPPFLAGS) $(CPPFLAGS) $(DSS_CFLAGS) $(CFLAGS) *.c > $@ -include Makefile.deps dss: $(dss_objects) - $(CC) -o $@ $(dss_objects) - -cmdline.o: cmdline.c cmdline.h - $(CC) -c $(CFLAGS) $< + $(CC) -o $@ $(dss_objects) $(LDFLAGS) -llopsub %.o: %.c Makefile - $(CC) -c $(CFLAGS) $(DEBUG_CFLAGS) $< + $(CC) -c $(DSS_CPPFLAGS) $(CPPFLAGS) $(DSS_CFLAGS) $(CFLAGS) $< - %.png: %.dia - dia -e $@ -t png $< + dss.png: mklogo + ./mklogo > $@ -cmdline.c cmdline.h: dss.ggo - gengetopt --conf-parser < $< - -dss.1: dss dss.1.inc - help2man -h --detailed-help --include dss.1.inc -N ./$< > $@ +%.lsg.h: %.suite + lopsubgen --gen-h=$@ < $< +%.lsg.c: %.suite + lopsubgen --gen-c=$@ < $< +%.1: %.suite + lopsubgen --gen-man=$@ --version-string=$(VERSION_STRING) < $< %.1.html: %.1 groff -m man -Thtml -P -l -P -r $< | sed -e '1,/^/d; /^<\/body>/,$$d' > $@ clean: - rm -f *.o dss dss.1 dss.1.html Makefile.deps *.png *~ cmdline.c cmdline.h index.html + rm -f *.o dss dss.1 dss.1.html Makefile.deps *.png *~ index.html dss.lsg.h dss.lsg.c + +ifneq ($(findstring strip, $(MAKECMDGOALS)),) + strip_option := -s +endif +bindir := $(DESTDIR)$(PREFIX)/bin +mandir := $(DESTDIR)$(PREFIX)/share/man/man1 +install install-strip: all + $(MKDIR_P) $(bindir) $(mandir) + $(INSTALL_PROGRAM) $(strip_option) dss $(bindir) + $(INSTALL_DATA) dss.1 $(mandir) index.html: dss.1.html index.html.in INSTALL README NEWS sed -e '/@README@/,$$d' index.html.in > $@ diff --combined NEWS index 755cad2,1532320..28fcb49 --- a/NEWS +++ b/NEWS @@@ -1,26 -1,3 +1,28 @@@ +----------------------- +x.y.z (to be announced) +----------------------- + + - Improved error diagnostics for the kill subcommand. + + - The --no-resume option has been removed. + + - The gengetopt option parser has been replaced by the + [lopsub](http://people.tuebingen.mpg.de/~maan/lopsub) library. Hence + lopsub must be installed to compile this package. Also help2man is + no longer required since lopsub has built-in roff support. + + - "make install" will install the executable and the man page. + + - In run mode, dss no longer exits successfully if another instance + is already running. + + - New option --checksum to let rsync compute checksums occasionally. + + - CFLAGS, CPPFLAGS and LDFLAGS can now be used to override the flags + of the build system. + ++ - The dss logo is now created with ImageMagick rather than dia. ++ ------------------ 0.1.7 (2017-04-17) ------------------