commit changes that have been sitting there for years, being copied from drive to drive

3 files changed, 103 insertions, 32 deletions

diff --git a/wrapper/Makefile.in b/wrapper/Makefile.in
new file mode 100644
index 0000000..cfe9772
--- /dev/null
+++ b/wrapper/Makefile.in
@@ -0,0 +1,90 @@
+#!/usr/bin/make -f
+#name = Luke's Makefile
+#ver = 1.0
+#  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 <http://www.gnu.org/licenses>.
+
+# Directories ########################################################
+DESTDIR = @DESTDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
+srcdir = @srcdir@
+VPATH = $(srcdir)
+
+# Programs ###########################################################
+SHELL = /bin/sh
+CC = gcc
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL) -m 644
+MKDIR = $(INSTALL) -d #mkdir -p
+RM = rm -f
+SED = sed
+
+include main.mk
+
+# dist ###############################################################
+d = $(name)-$(ver)
+.PHONY : dist
+dist : $(d).tar.gz
+
+$(d).tar.gz : $(d) $(addprefix $(d)/,$(filelist))
+	tar -czf $@ $<
+
+$(d) : 
+	$(INSTALL) -m 777 -d $@
+
+$(d)/% : $(srcdir)/% $(d)
+	$(INSTALL) -m 777 -d $(dir $@)
+	cp $< $@
+
+# implicit rules #####################################################
+$(addprefix $(DESTDIR),$(dirs)) :
+	$(MKDIR) $@
+
+% : %.sh
+	$(SED) 's/@VER@/$(ver)/g' < $< > $@
+
+$(DESTDIR)$(bindir)/% : % $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $< $@
+
+.PHONY : dist Makefiles
+
+csources = $(filter %.c,$(filelist))
+Makefiles : $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(shell find '$(srcdir)' -type f -name Makefile.in) \
+            $(csources:.c=.d)
+
+%Makefile %.mk : $(srcdir)/configure
+	$< @CONFIG@
+
+# This is taken straight from the GNU `make' manual.
+# That makes it GFDL, which is incompatible with the GPL
+# I claim `fair-use'
+%.d: %.c
+	@set -e; rm -f $@; \
+	$(CC) -M $(CPPFLAGS) $< > $@.$$$$; \
+	sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+	rm -f $@.$$$$
+
+ifneq ($(shell ls -d $(csources:.c=.d) 2>/dev/null),)
+  include $(csources:.c=.d)
+endif
+
diff --git a/wrapper/runcom.mk.in b/wrapper/runcom.mk.in
new file mode 100644
index 0000000..55782f0
--- /dev/null
+++ b/wrapper/runcom.mk.in
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+
+FIND = $(patsubst $(1)/%,%,$(wildcard $(2)/*))
+
+COMMANDS       = $(call FIND,$(BINDIR),$(BINDIR))
+$(COMMANDS): % : $(call FIND,$(BINDIR),$(BINDIR)/%)
+
+% :: 
+	"$(BINDIR)/$@" $(ARGS)
+
+include $(wildcard $(DEPDIR)/*)
+
diff --git a/wrapper/rvs.sh b/wrapper/rvs.sh
index 101268f..19a8188 100644
--- a/wrapper/rvs.sh
+++ b/wrapper/rvs.sh
@@ -20,6 +20,7 @@ ver='0.9'
 
 export RVS="$0" #RVS='@RVS@'
        BINDIR='@BINDIR@'
+       DEPDIR='@DEPDIR@'
    baseTMPDIR='@TMPDIR@'
 export LIBDIR='@LIBDIR@'
 export ETCDIR='@ETCDIR@'
@@ -131,38 +132,6 @@ _init() {
 }
 
 ################################################################################
-# Builtin commands -- installing modules                                       #
-################################################################################
-
-_install() {
-	usage="usage: $RVS install FILE COMMAND ID [PRIORITY]"
-	    file=${1?"$usage"}
-	 command=${2?"$usage"}
-	      id=${3?"$usage"}
-	priority=${4-"`_nextpriority "$command"`"}
-	
-	install -d "$BINDIR/$command"
-	install "$file" "$BINDIR/$command/$priority-$id"
-}
-
-_uninstall() {
-	usage="usage: $RVS uninstall COMMAND [ID]"
-	command=${1?"$usage"}
-	id=$2
-	
-	if [ -z "$id" ]; then
-		# no ID specified
-		rm "$BINDIR/$command"
-	else
-		# ID specified
-		rm "$BINDIR/$command/"*-"$id"
-		if [ -z "$(ls "$BINDIR/$command")" ]; then 
-			rmdir "$BINDIR/$command"
-		fi
-	fi
-}
-
-################################################################################
 # Main                                                                         #
 ################################################################################