diff --git a/Makefile b/Makefile index 83531b2e..09a3fed7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# finit - The Improved fast init +# Finit - Extremely fast /sbin/init replacement w/ I/O, hook & service plugins # # Copyright (c) 2008-2010 Claudio Matsuoka # Copyright (c) 2008-2012 Joachim Nilsson @@ -21,11 +21,24 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -.PHONY: all romfs clean +.PHONY: all install clean distclean dist \ + install-exec install-data install-dev \ + uninstall-exec uninstall-data uninstall-dev # Top directory for building complete system, fall back to this directory ROOTDIR ?= $(shell pwd) +#VERSION ?= $(shell git tag -l | tail -1) +VERSION ?= 1.3 +EXEC = finit +PKG = $(EXEC)-$(VERSION) +ARCHIVE = $(PKG).tar.xz +HEADERS = plugin.h svc.h helpers.h +OBJS = finit.o conf.o helpers.o sig.o svc.o plugin.o +OBJS += strlcpy.o +SRCS = $(OBJS:.o=.c) +DEPS = $(addprefix .,$(SRCS:.c=.d)) + # Installation paths, always prepended with DESTDIR if set prefix ?= /usr/local sysconfdir ?= /etc @@ -41,16 +54,6 @@ FINIT_FIFO ?= /dev/initctl FINIT_CONF ?= $(sysconfdir)/finit.conf FINIT_RCSD ?= $(sysconfdir)/finit.d -#VERSION ?= $(shell git tag -l | tail -1) -VERSION ?= 1.2 -EXEC = finit -PKG = $(EXEC)-$(VERSION) -ARCHIVE = $(PKG).tar.xz -HEADERS = plugin.h svc.h helpers.h -OBJS = finit.o conf.o helpers.o sig.o svc.o plugin.o -OBJS += strlcpy.o -SRCS = $(OBJS:.o=.c) -DEPS = $(addprefix .,$(SRCS:.c=.d)) CFLAGS += -W -Wall -Werror -Os # Disable annoying gcc warning for "warn_unused_result", see GIT 37af997 CPPFLAGS += -U_FORTIFY_SOURCE @@ -125,10 +128,6 @@ dist: git archive --format=tar --prefix=$(PKG)/ $(VERSION) | xz >../$(ARCHIVE) @(cd ..; md5sum $(ARCHIVE) | tee $(ARCHIVE).md5) -.PHONY: all install clean distclean dist \ - install-exec install-data install-dev \ - uninstall-exec uninstall-data uninstall-dev - # Include automatically generated rules, such as: # uncgi.o: .../some/dir/uncgi.c /usr/include/stdio.h # but don't bother during clean! diff --git a/finit.c b/finit.c index 8d85d077..e457a60b 100644 --- a/finit.c +++ b/finit.c @@ -1,4 +1,4 @@ -/* Improved fast init +/* Finit - Extremely fast /sbin/init replacement w/ I/O, hook & service plugins * * Copyright (c) 2008-2010 Claudio Matsuoka * Copyright (c) 2008-2012 Joachim Nilsson diff --git a/finit.h b/finit.h index 458979ed..1c3c0757 100644 --- a/finit.h +++ b/finit.h @@ -1,4 +1,4 @@ -/* Improved fast init +/* Finit - Extremely fast /sbin/init replacement w/ I/O, hook & service plugins * * Copyright (c) 2008-2010 Claudio Matsuoka * Copyright (c) 2008-2012 Joachim Nilsson diff --git a/helpers.c b/helpers.c index 110bbe10..d250e554 100644 --- a/helpers.c +++ b/helpers.c @@ -1,4 +1,4 @@ -/* Misc. utility functions and C-library extensions to simplify finit system setup. +/* Misc. utility functions and C-library extensions for finit and its plugins * * Copyright (c) 2008-2010 Claudio Matsuoka * Copyright (c) 2008-2012 Joachim Nilsson diff --git a/helpers.h b/helpers.h index eab2b87e..9315b2db 100644 --- a/helpers.h +++ b/helpers.h @@ -1,4 +1,4 @@ -/* Misc. utility functions and C-library extensions to simplify finit system setup. +/* Misc. utility functions and C-library extensions for finit and its plugins * * Copyright (c) 2008-2010 Claudio Matsuoka * Copyright (c) 2008-2012 Joachim Nilsson diff --git a/svc.c b/svc.c index 62bbf53b..757b6967 100644 --- a/svc.c +++ b/svc.c @@ -1,4 +1,4 @@ -/* Generic API for managing svc_t structures +/* Finit service monitor and heneric API for managing svc_t structures * * Copyright (c) 2008-2010 Claudio Matsuoka * Copyright (c) 2008-2012 Joachim Nilsson diff --git a/svc.h b/svc.h index b82774a3..a9b763ab 100644 --- a/svc.h +++ b/svc.h @@ -1,4 +1,4 @@ -/* Generic API for managing svc_t structures +/* Finit service monitor and heneric API for managing svc_t structures * * Copyright (c) 2008-2010 Claudio Matsuoka * Copyright (c) 2008-2012 Joachim Nilsson