From d946d850217edead9748082ac4be8d874d81e6e8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 25 Oct 2009 14:11:26 -0400 Subject: hmm. I kind of screwed up rvs plugins. Worst, it was just a command I typed wrong that crippled a few files --- rvs/main.mk.in | 127 +++++++++++++++++++++--------------------- rvs/plugins/repo/Makefile.in | 108 ----------------------------------- rvs/plugins/users/Makefile.in | 108 ----------------------------------- rvs/wrapper/Makefile.in | 114 ------------------------------------- rvs/wrapper/main.mk.in | 74 ++++++++++++++++++++++++ 5 files changed, 138 insertions(+), 393 deletions(-) delete mode 100644 rvs/plugins/repo/Makefile.in delete mode 100644 rvs/plugins/users/Makefile.in delete mode 100644 rvs/wrapper/Makefile.in create mode 100644 rvs/wrapper/main.mk.in (limited to 'rvs') diff --git a/rvs/main.mk.in b/rvs/main.mk.in index ee7aac5..46fa64a 100644 --- a/rvs/main.mk.in +++ b/rvs/main.mk.in @@ -1,84 +1,85 @@ #!/usr/bin/make -f -name = @name@ -ver = 0.9 -# Copyright (C) 2009 Luke Shumaker -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; see the file COPYING. -# If not, see . - -rvs = $(name) -RVS = @RVS@ -# plugins ########################################################## -plugins = $(patsubst $(srcdir)/plugins/%,%, \ - $(shell find $(srcdir)/plugins/* -maxdepth 0 -type d)) - -build-plugins = $(addprefix p-,$(plugins)) -install-plugins = $(addprefix install-p-,$(plugins)) -uninstall-plugins = $(addprefix uninstall-p-,$(plugins)) -clean-plugins = $(addprefix clean-p-,$(plugins)) -distclean-plugins = $(addprefix distclean-p-,$(plugins)) -dist-plugins = $(addprefix dist-p-,$(plugins)) +name=repo +ver=0.8r61 +# Copyright (C) 2009 Luke Shumaker +# +# This file is part of rvs. +# +# rvs is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2, or (at your option) any later version. +# +# rvs 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. +# +# You should have received a copy of the GNU General Public License +# along with rvs; see the file COPYING. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +export rvs = @name@ # phony targets #################################################### -all : wrapper $(build-plugins) -.PHONY : install uninstall clean distclean dist libexec \ - build-wrapper install-wrapper uninstall-wrapper clean-wrapper distclean-wrapper dist-wrapper -#$(build-plugins) $(install-plugins) $(uninstall-plugins) $(clean-plugins) $(distclean-plugins) $(dist-plugins) - +all : $(name) +.PHONY : $(name) install uninstall clean distclean dist .SUFFIXES : -# install ########################################################## +# build ############################################################ +mysrcdir = $(srcdir)/plugins/$(name) +myoutdir = outs + +srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f)) + +shSrcFiles = $(filter %.sh,$(srcFiles)) +shOutFiles = $(patsubst $(mysrcdir)/%,$(myoutdir)/%,$(basename $(shSrcFiles))) -install : install-wrapper libexec $(install-plugins) +$(name) : $(myoutdir) $(shOutFiles) $(myoutdir)/plugin.conf -# $(libexecdir)/rvs/* -libexec : $(libexecdir)/$(rvs)/plugins -$(libexecdir)/$(rvs)/plugins : $(libexecdir)/$(rvs) - $(TOUCH) $@ +$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf + $(INSTALL_DATA) $< $@ -# uninstall ######################################################## +# (un)install ###################################################### + +install : all + $(RVS) install $(name)-$(ver) $(myoutdir) uninstall : - $(RM) $(bindir)/$(rvs) - $(RM) -r $(libexecdir)/$(rvs) + $(RVS) uninstall $(name) # clean ############################################################ -clean : $(clean-plugins) clean-wrapper +clean : -distclean : clean $(distclean-plugins) distclean-wrapper +distclean : clean $(RM) Makefile + $(RM) -r out + +# dist ############################################################# + +id = $(name)-$(ver) +dist : $(id).tar.gz -# wrapper ########################################################## +$(id).tar.gz : $(id) + tar -czf $@ $< -wrapper : build-wrapper -build-wrapper : wrapper/ wrapper/Makefile; $(MAKE) -C $< -uninstall-wrapper : wrapper/ wrapper/Makefile; $(MAKE) -C $< uninstall -clean-wrapper : wrapper/ wrapper/Makefile; $(MAKE) -C $< clean -distclean-wrapper : wrapper/ wrapper/Makefile; $(MAKE) -C $< distclean -dist-wrapper : wrapper/ wrapper/Makefile; $(MAKE) -C $< dist +$(id) : distclean + $(INSTALL) -m 777 -d $@ + $(CP) -r $(mysrcdir)/* $@ -install-wrapper : wrapper/ wrapper/Makefile wrapper; $(MAKE) -C $< install -$(RVS) : install-wrapper +# implicit rules ################################################### -# plugins ########################################################## +b := @ +# build shell scripts +$(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir) + $(INSTALL_PROGRAM) $< $@ + $(SED) -i \ + -e 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' \ + -e 's/$blibexecdir@/$(subst /,\/,$(libexecdir))/g' \ + -e 's/$bID@/$(subst /,\/,$(id))/g' \ + $@ -install-p-% : plugins/% plugins/%/Makefile p-% libexec $(RVS) - $(MAKE) -C $< install -p-% : plugins/% plugins/%/Makefile ; $(MAKE) -C $< -uninstall-p-% : plugins/% plugins/%/Makefile ; $(MAKE) -C $< uninstall -clean-p-% : plugins/% plugins/%/Makefile ; $(MAKE) -C $< clean -distclean-p-% : plugins/% plugins/%/Makefile ; $(MAKE) -C $< distclean -dist-p-% : plugins/% plugins/%/Makefile ; $(MAKE) -C $< dist +$(dirs) $(libexecdir)/$(rvs) $(myoutdir) : + $(MKDIR) $@ diff --git a/rvs/plugins/repo/Makefile.in b/rvs/plugins/repo/Makefile.in deleted file mode 100644 index 7078bb6..0000000 --- a/rvs/plugins/repo/Makefile.in +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/make -f -name=repo -ver=0.8r61 -# Copyright (C) 2009 Luke Shumaker -# -# This file is part of rvs. -# -# rvs is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2, or (at your option) any later version. -# -# rvs 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. -# -# You should have received a copy of the GNU General Public License -# along with rvs; see the file COPYING. -# If not, write to the Free Software Foundation, -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -export rvs ?= @name@ -# directories ###################################################### -srcdir ?= @srcdir@ -prefix ?= @prefix@ -exec_prefix ?= @exec_prefix@ -bindir ?= @bindir@ -sbindir ?= @sbindir@ -libexecdir ?= @libexecdir@ -dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)/ -#export srcdir prefix exec_prefix bindir sbindir libexecdir - -# programs ######################################################### -CC ?= @CC@ -RVS ?= @RVS@ -SHELL ?= @SHELL@ -RM ?= rm -CP ?= cp -SED ?= sed -INSTALL ?= install -MKDIR ?= $(INSTALL) -d #mkdir -p -INSTALL_PROGRAM ?= $(INSTALL) -INSTALL_DATA ?= $(INSTALL) -m 644 -TOUCH ?= touch # This file doesn't use touch -#export RVS SHELL RM CP SED INSTALL MKDIR INSTALL_PROGRAM INSTALL_DATA TOUCH - -# phony targets #################################################### -all : $(name) -.PHONY : $(name) install uninstall clean distclean dist -.SUFFIXES : - -# build ############################################################ -mysrcdir = $(srcdir)/plugins/$(name) -myoutdir = out - -srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f)) - -shSrcFiles = $(filter %.sh,$(srcFiles)) -shOutFiles = $(patsubst $(mysrcdir)/%,$(myoutdir)/%,$(basename $(shSrcFiles))) - -$(name) : $(myoutdir) $(shOutFiles) $(myoutdir)/plugin.conf - -$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf - $(INSTALL_DATA) $< $@ - -# (un)install ###################################################### - -install : all - $(RVS) install $(name)-$(ver) $(myoutdir) - -uninstall : - $(RVS) uninstall $(name) - -# clean ############################################################ - -clean : - -distclean : clean - $(RM) Makefile - $(RM) -r out - -# dist ############################################################# - -id = $(name)-$(ver) -dist : $(id).tar.gz - -$(id).tar.gz : $(id) - tar -czf $@ $< - -$(id) : distclean - $(INSTALL) -m 777 -d $@ - $(CP) -r $(mysrcdir)/* $@ - -# implicit rules ################################################### - -b := @ -# build shell scripts -$(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir) - $(INSTALL_PROGRAM) $< $@ - $(SED) -i \ - -e 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' \ - -e 's/$blibexecdir@/$(subst /,\/,$(libexecdir))/g' \ - -e 's/$bID@/$(subst /,\/,$(id))/g' \ - $@ - -$(dirs) $(libexecdir)/$(rvs) $(myoutdir) : - $(MKDIR) $@ - diff --git a/rvs/plugins/users/Makefile.in b/rvs/plugins/users/Makefile.in deleted file mode 100644 index 0ac9cf5..0000000 --- a/rvs/plugins/users/Makefile.in +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/make -f -name=users -ver=0.8r61 -# Copyright (C) 2009 Luke Shumaker -# -# This file is part of rvs. -# -# rvs is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2, or (at your option) any later version. -# -# rvs 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. -# -# You should have received a copy of the GNU General Public License -# along with rvs; see the file COPYING. -# If not, write to the Free Software Foundation, -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -export rvs ?= @name@ -# directories ###################################################### -srcdir ?= @srcdir@ -prefix ?= @prefix@ -exec_prefix ?= @exec_prefix@ -bindir ?= @bindir@ -sbindir ?= @sbindir@ -libexecdir ?= @libexecdir@ -dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)/ -#export srcdir prefix exec_prefix bindir sbindir libexecdir - -# programs ######################################################### -CC ?= @CC@ -RVS ?= @RVS@ -SHELL ?= @SHELL@ -RM ?= rm -CP ?= cp -SED ?= sed -INSTALL ?= install -MKDIR ?= $(INSTALL) -d #mkdir -p -INSTALL_PROGRAM ?= $(INSTALL) -INSTALL_DATA ?= $(INSTALL) -m 644 -TOUCH ?= touch # This file doesn't use touch -#export RVS SHELL RM CP SED INSTALL MKDIR INSTALL_PROGRAM INSTALL_DATA TOUCH - -# phony targets #################################################### -all : $(name) -.PHONY : $(name) install uninstall clean distclean dist -.SUFFIXES : - -# build ############################################################ -mysrcdir = $(srcdir)/plugins/$(name) -myoutdir = out - -srcFiles = $(filter-out %/Makefile.in,$(shell find $(mysrcdir)/ -type f)) - -shSrcFiles = $(filter %.sh,$(srcFiles)) -shOutFiles = $(patsubst $(mysrcdir)/%,$(myoutdir)/%,$(basename $(shSrcFiles))) - -$(name) : $(myoutdir) $(shOutFiles) $(myoutdir)/plugin.conf - -$(myoutdir)/plugin.conf : $(mysrcdir)/plugin.conf - $(INSTALL_DATA) $< $@ - -# (un)install ###################################################### - -install : all - $(RVS) install $(name)-$(ver) $(myoutdir) - -uninstall : - $(RVS) uninstall $(name) - -# clean ############################################################ - -clean : - -distclean : clean - $(RM) Makefile - $(RM) -r out - -# dist ############################################################# - -id = $(name)-$(ver) -dist : $(id).tar.gz - -$(id).tar.gz : $(id) - tar -czf $@ $< - -$(id) : distclean - $(INSTALL) -m 777 -d $@ - $(CP) -r $(mysrcdir)/* $@ - -# implicit rules ################################################### - -b := @ -# build shell scripts -$(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir) - $(INSTALL_PROGRAM) $< $@ - $(SED) -i \ - -e 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' \ - -e 's/$blibexecdir@/$(subst /,\/,$(libexecdir))/g' \ - -e 's/$bID@/$(subst /,\/,$(id))/g' \ - $@ - -$(dirs) $(libexecdir)/$(rvs) $(myoutdir) : - $(MKDIR) $@ - diff --git a/rvs/wrapper/Makefile.in b/rvs/wrapper/Makefile.in deleted file mode 100644 index 9584a2a..0000000 --- a/rvs/wrapper/Makefile.in +++ /dev/null @@ -1,114 +0,0 @@ -#!/usr/bin/make -f -name = @name@ -ver = 0.8r60 -# Copyright (C) 2009 Luke Shumaker -# -# This file is part of rvs. -# -# rvs is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2, or (at your option) any later version. -# -# rvs 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. -# -# You should have received a copy of the GNU General Public License -# along with rvs; see the file COPYING. -# If not, write to the Free Software Foundation, -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -export rvs ?= @name@ -# directories ###################################################### -srcdir ?= @srcdir@ -prefix ?= @prefix@ -exec_prefix ?= @exec_prefix@ -bindir ?= @bindir@ -sbindir ?= @sbindir@ -libexecdir ?= @libexecdir@ -dirs = $(srcdir) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir) -#export srcdir prefix exec_prefix bindir sbindir libexecdir - -# programs ######################################################### -CC = @CC@ -RVS ?= @RVS@ -SHELL ?= @SHELL@ -RM ?= rm -CP ?= cp -SED ?= sed -INSTALL ?= install -MKDIR ?= $(INSTALL) -d #mkdir -p -INSTALL_PROGRAM ?= $(INSTALL) -INSTALL_DATA ?= $(INSTALL) -m 644 -TOUCH ?= touch # This file doesn't use touch -#export RVS SHELL RM CP SED INSTALL MKDIR INSTALL_PROGRAM INSTALL_DATA TOUCH - -CFLAGS = -g \ - -DNAME=\"$(name)\" \ - -DVER=\"$(ver)\" \ - -Dlibexecdir=\"$(libexecdir)/$(rvs)\" \ - -Dplugin_conf=\"plugin.conf\" - -# phony targets #################################################### -all : rvs runcom -.PHONY : install uninstall clean distclean dist install-runcom -.SUFFIXES : .c .o -VPATH = $(srcdir)/wrapper - -# most everything ################################################## -RUNCOM = $(libexecdir)/$(rvs)/runcom -install : $(RVS) $(RUNCOM) -$(RVS) : rvs $(dir $(RVS)) - $(INSTALL_PROGRAM) $< $@ - -OBJ = runcom.o rvs.o plugins.o \ - plugin-depend.o \ - plugin-find.o \ - plugin-load.o \ - plugin-parse.o \ - plugin-run.o \ - -runcom: $(OBJ) - gcc -o $@ $^ - -$(RUNCOM): runcom $(dir $(RUNCOM)) - $(INSTALL_PROGRAM) $< $@ - -b := @ -# build shell scripts -rvs : rvs.sh - $(INSTALL_PROGRAM) $< $@ - $(SED) -i \ - -e 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' \ - -e 's/$bname@/$(rvs)/g' \ - -e 's/$blibexecdir@/$(subst /,\/,$(libexecdir))/g' \ - $@ - -uninstall : - $(RM) $(RVS) - $(RM) $(libexecdir)/$(rvs)/runcom - -clean : - -distclean : clean - $(RM) rvs - $(RM) Makefile - -# dist ############################################################# - -d = $(name)-$(ver) -dist : $(d).tar.gz - -$(d).tar.gz : $(d) - tar -czf $@ $< - -$(d) : distclean - $(INSTALL) -m 777 -d $@ - $(CP) -r $(srcdir)/* $@ - -# implicit rules ################################################### - -$(dirs) $(libexecdir)/$(rvs) : - $(MKDIR) $@ - diff --git a/rvs/wrapper/main.mk.in b/rvs/wrapper/main.mk.in new file mode 100644 index 0000000..8d53d3b --- /dev/null +++ b/rvs/wrapper/main.mk.in @@ -0,0 +1,74 @@ +#!/usr/bin/make -f +name = @name@ +ver = 0.8r60 +# Copyright (C) 2009 Luke Shumaker +# +# This file is part of rvs. +# +# rvs is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2, or (at your option) any later version. +# +# rvs 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. +# +# You should have received a copy of the GNU General Public License +# along with rvs; see the file COPYING. +# If not, write to the Free Software Foundation, +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +rvs = @name@ + +CFLAGS = -g \ + -DNAME=\"$(name)\" \ + -DVER=\"$(ver)\" \ + -Dlibexecdir=\"$(libexecdir)/$(rvs)\" \ + -Dplugin_conf=\"plugin.conf\" + +# phony targets #################################################### +all : rvs runcom +.PHONY : install uninstall clean distclean dist install-runcom +.SUFFIXES : .c .o +VPATH = $(srcdir)/wrapper + +# most everything ################################################## +RUNCOM = $(DESTDIR)$(libexecdir)/$(rvs)/runcom +install : $(RVS) $(RUNCOM) +$(RVS) : rvs $(dir $(RVS)) + $(INSTALL_PROGRAM) $< $@ + +#OBJ = runcom.o rvs.o plugins.o \ +# plugin-depend.o \ +# plugin-find.o \ +# plugin-load.o \ +# plugin-parse.o \ +# plugin-run.o \ + +#runcom: $(OBJ) +# gcc -o $@ $^ + +$(RUNCOM): runcom $(dir $(RUNCOM)) + $(INSTALL_PROGRAM) $< $@ + +b := @ +# build shell scripts +rvs : rvs.sh + $(INSTALL_PROGRAM) $< $@ + $(SED) -i \ + -e 's/$bSHELL@/$(subst /,\/,$(SHELL))/g' \ + -e 's/$bname@/$(rvs)/g' \ + -e 's/$blibexecdir@/$(subst /,\/,$(libexecdir))/g' \ + $@ + +uninstall : + $(RM) $(RVS) + $(RM) $(DESTDIR)$(libexecdir)/$(rvs)/runcom + +clean : + +distclean : clean + $(RM) rvs + $(RM) Makefile + -- cgit v1.2.3-2-g168b