From ea8a13dfa2a25f52cc245a8992fbff5d1e41106d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 5 Sep 2009 13:00:55 -0400
Subject: work on tieing it all together

---
 Makefile.in | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 165d11b..bef0841 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,6 +31,7 @@ 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 -f
@@ -44,40 +45,29 @@ TOUCH  = touch
 export RVS SHELL RM CP SED INSTALL MKDIR INSTALL_PROGRAM INSTALL_DATA TOUCH
 
 # plugins ##########################################################
-plugins = $(patsubst $(srcdir)/plugins/%,%,\
+plugins = $(patsubst $(srcdir)/plugins/%,%, \
  $(shell find $(srcdir)/plugins/* -maxdepth 0 -type d))
 
 build-plugins      = $(addprefix           p-,$(plugins))
-install-plugins    = $(addprefix   install-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))
-
-#uninstall-plugins  = $(addprefix uninstall-p-,$(plugins))
-#dist-plugins       = $(addprefix      dist-p-,$(plugins))
+dist-plugins       = $(addprefix      dist-p-,$(plugins))
 
 # phony targets ####################################################
 all : $(rvs) $(build-plugins)
-.PHONY : install uninstall clean distclean libexec
+.PHONY : install uninstall clean distclean dist libexec $(build-plugins) $(rvs)\
+$(install-plugins) $(uninstall-plugins) $(clean-plugins) $(distclean-plugins) \
+  install-$(rvs)     uninstall-$(rvs)     clean-$(rvs)     distclean-$(rvs)   \
+$(dist-plugins) \
+  dist-$(rvs)
 .SUFFIXES :
 
-# build ############################################################
-b := @
-$(rvs) : $(srcdir)/rvs.sh
-	$(SED) \
-  -e 's/$bSHELL@/$(subst      /,\/,$(SHELL))/g' \
-  -e 's/$blibexecdir@/$(subst /,\/,$(libexecdir))/g' \
-  -e 's/$bname@/$(subst       /,\/,$(name))/g' \
-    < $< > $@
-
 # install ##########################################################
 
-install : install-$(name) libexec $(install-plugins)
+install : install-$(rvs) libexec $(install-plugins)
 
-# core executable
-install-$(name) : $(RVS)
-$(RVS) : $(rvs) $(bindir)
-	$(INSTALL_PROGRAM) $< $@
-	
 # $(libexecdir)/rvs/*
 libexec : $(libexecdir)/$(rvs)/plugins
 $(libexecdir)/$(rvs)/plugins : $(libexecdir)/$(rvs)
@@ -91,12 +81,10 @@ uninstall :
 
 # clean ############################################################
 
-clean : $(clean-plugins)
-	$(RM) var.sed
+clean : $(clean-plugins) clean-$(rvs)
 
-distclean : clean $(distclean-plugins)
+distclean : clean $(distclean-plugins) distclean-$(rvs)
 	$(RM) Makefile
-	$(RM) $(rvs)
 
 # dist #############################################################
 
@@ -110,6 +98,17 @@ $(d) : distclean
 	$(INSTALL) -m 777 -d $@
 	$(CP) -r $(srcdir)/* $@
 
+# wrapper ##########################################################
+
+$(rvs)           : wrapper/ wrapper/Makefile; $(MAKE) -C $<
+uninstall-$(rvs) : wrapper/ wrapper/Makefile; $(MAKE) -C $< uninstall
+clean-$(rvs)     : wrapper/ wrapper/Makefile; $(MAKE) -C $< clean
+distclean-$(rvs) : wrapper/ wrapper/Makefile; $(MAKE) -C $< distclean
+dist-$(rvs)      : wrapper/ wrapper/Makefile; $(MAKE) -C $< dist
+
+install-$(rvs)   : wrapper/ wrapper/Makefile $(rvs); $(MAKE) -C $< install
+$(RVS) : install-$(rvs)
+
 # plugins ##########################################################
 
 install-p-%   : plugins/% plugins/%/Makefile p-% libexec $(RVS)
-- 
cgit v1.2.3