From 3e100e9de3cec5ec5e9a641e782ae47ca095233d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 13 Sep 2009 15:20:14 -0400 Subject: bichun! fixed makefiles, moved around files The wrapper is now a hybrid shell-C program. A shell script does the integrated commands, but it calls the C program (`$(libexecdir)/rvs/runcom') to launch plugins Note that right now, it does EVERYTHING BUT launch plugins. --- Makefile.in | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index bef0841..e72005a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,19 +54,18 @@ uninstall-plugins = $(addprefix uninstall-p-,$(plugins)) clean-plugins = $(addprefix clean-p-,$(plugins)) distclean-plugins = $(addprefix distclean-p-,$(plugins)) dist-plugins = $(addprefix dist-p-,$(plugins)) - +$(info $(build-plugins)) # phony targets #################################################### -all : $(rvs) $(build-plugins) -.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) +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) + .SUFFIXES : # install ########################################################## -install : install-$(rvs) libexec $(install-plugins) +install : install-wrapper libexec $(install-plugins) # $(libexecdir)/rvs/* libexec : $(libexecdir)/$(rvs)/plugins @@ -81,9 +80,9 @@ uninstall : # clean ############################################################ -clean : $(clean-plugins) clean-$(rvs) +clean : $(clean-plugins) clean-wrapper -distclean : clean $(distclean-plugins) distclean-$(rvs) +distclean : clean $(distclean-plugins) distclean-wrapper $(RM) Makefile # dist ############################################################# @@ -100,14 +99,15 @@ $(d) : distclean # 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 +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 -install-$(rvs) : wrapper/ wrapper/Makefile $(rvs); $(MAKE) -C $< install -$(RVS) : install-$(rvs) +install-wrapper : wrapper/ wrapper/Makefile wrapper; $(MAKE) -C $< install +$(RVS) : install-wrapper # plugins ########################################################## -- cgit v1.2.3