From 35474a80e52e016a0cafb1f583e0d036fd66e85e 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 --- wrapper/Makefile.in | 114 ---------------------------------------------------- wrapper/main.mk.in | 74 ++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 114 deletions(-) delete mode 100644 wrapper/Makefile.in create mode 100644 wrapper/main.mk.in (limited to 'wrapper') diff --git a/wrapper/Makefile.in b/wrapper/Makefile.in deleted file mode 100644 index 9584a2a..0000000 --- a/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/wrapper/main.mk.in b/wrapper/main.mk.in new file mode 100644 index 0000000..8d53d3b --- /dev/null +++ b/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