From 87348edd1b6f1e0f79f76d0c95676214396a5fcd Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 27 Jul 2009 17:19:52 -0400 Subject: Further refactoring. Mostly tweaking makefiles. Switched to autoconf-style variables. This means I had to change every shell script... --- plugins/users/Makefile.orig | 79 +++++++++++++++++++++++++++++++++++++++++++++ plugins/users/init.sh | 2 +- plugins/users/mkuser.sh | 2 +- plugins/users/rmuser.sh | 2 +- 4 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 plugins/users/Makefile.orig (limited to 'plugins/users') diff --git a/plugins/users/Makefile.orig b/plugins/users/Makefile.orig new file mode 100644 index 0000000..ab109a7 --- /dev/null +++ b/plugins/users/Makefile.orig @@ -0,0 +1,79 @@ +#!/usr/bin/make -f +name = users +# version 0.7.0 +# Copyright (C) 2009 Luke Shumaker +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# Originally written by Luke Shumaker . + + +# Variables ######################################################## +RM ?= rm -f +CP ?= cp +SED ?= sed +INSTALL = install +MKDIR ?= $(INSTALL) -d #mkdir -p +INSTALL_PROGRAM ?= $(INSTALL) +INSTALL_DATA ?= $(INSTALL) -m 644 + +SHELL ?= @SHELL@ +rvsdir ?= @rvsdir@/rvs +srcdir ?= @srcdir@ + +libdir = $(rvsdir)/$(name) +reldir = plugins/$(name) + +mysrcdir = $(srcdir)/$(reldir) +VPATH = $(mysrcdir) + +# phony targets #################################################### +all : $(name) +.PHONY : $(name) install clean remove +.SUFFIXES : + +# targets ########################################################## +srcFiles = $(filter-out %/Makefile.orig,$(shell find $(mysrcdir)/ -type f)) + +shSrcFiles = $(filter %.sh,$(srcFiles)) +shOutFiles = $(patsubst $(mysrcdir)/%,%,$(basename $(shSrcFiles))) +shExeFiles = $(patsubst %,$(libdir)/%, $(shOutFiles) ) + +$(name) : $(shOutFiles) + +# (un)install ###################################################### + +install : $(shExeFiles) + echo $(name) >> $(rvsdir)/plugins + +uninstall : + $(RM) -r $(libdir) + $(SED) -i "/^$(name)$/ d" $(rvsdir)/plugins + +# clean ############################################################ + +clean : + $(RM) $(shOutFiles) + +distclean : clean + $(RM) Makefile + +# implicit rules ################################################### + +b := @ +# build shell scripts +% : $(mysrcdir)/%.sh + $(MKDIR) $(dir $@) + $(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@ +# workaround... idk why it doesn't match `lib/' +lib/% : $(mysrcdir)/lib/%.sh + $(MKDIR) $(dir $@) + $(SED) 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' <$< > $@ + +# install +$(libdir)/% : % + $(MKDIR) $(dir $@) + $(INSTALL_PROGRAM) $< $@ + diff --git a/plugins/users/init.sh b/plugins/users/init.sh index ee570ff..ce1c6fd 100644 --- a/plugins/users/init.sh +++ b/plugins/users/init.sh @@ -1,4 +1,4 @@ -#!$$SHELL$$ +#!@SHELL@ name='rvs init' ver='0.7.0' # Copyright (C) 2009 Luke Shumaker diff --git a/plugins/users/mkuser.sh b/plugins/users/mkuser.sh index 594c024..de4aeea 100644 --- a/plugins/users/mkuser.sh +++ b/plugins/users/mkuser.sh @@ -1,4 +1,4 @@ -#!$$SHELL$$ +#!@SHELL@ name='rvs mkuser' ver='0.7.0' # Copyright (C) 2009 Luke Shumaker diff --git a/plugins/users/rmuser.sh b/plugins/users/rmuser.sh index 598bae9..85ba64a 100644 --- a/plugins/users/rmuser.sh +++ b/plugins/users/rmuser.sh @@ -1,4 +1,4 @@ -#!$$SHELL$$ +#!@SHELL@ name='rvs rmuser' ver='0.7.0' # Copyright (C) 2009 Luke Shumaker -- cgit v1.2.3-54-g00ecf