summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.mk.in52
-rw-r--r--plugins/repo/main.mk.in37
-rw-r--r--plugins/users/main.mk.in39
3 files changed, 14 insertions, 114 deletions
diff --git a/main.mk.in b/main.mk.in
index 9b884e4..66f77f8 100644
--- a/main.mk.in
+++ b/main.mk.in
@@ -20,29 +20,6 @@ ver = 0.8r58
# 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 -f
-CP = cp
-SED = sed
-INSTALL = install
-MKDIR = $(INSTALL) -d #mkdir -p
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL) -m 644
-TOUCH = touch
-export RVS SHELL RM CP SED INSTALL MKDIR INSTALL_PROGRAM INSTALL_DATA TOUCH
# plugins ##########################################################
plugins = $(patsubst $(srcdir)/plugins/%,%, \
@@ -57,12 +34,17 @@ dist-plugins = $(addprefix dist-p-,$(plugins))
# 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)
-
.SUFFIXES :
-
+VPATH = $(srcdir)
+filelist = \
+ COPYING \
+ configure \
+ Makefile.in \
+ main.mk.in \
+ config \
+ HACKING \
+ README \
+ $(shell find ./*/* -type f)
# install ##########################################################
install : install-wrapper libexec $(install-plugins)
@@ -85,18 +67,6 @@ clean : $(clean-plugins) clean-wrapper
distclean : clean $(distclean-plugins) distclean-wrapper
$(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)/* $@
-
# wrapper ##########################################################
wrapper : build-wrapper
@@ -121,6 +91,6 @@ dist-p-% : plugins/% plugins/%/Makefile ; $(MAKE) -C $< dist
# implicit rules ###################################################
-$(dirs) $(libexecdir)/$(rvs) :
+$(libexecdir)/$(rvs) :
$(MKDIR) $@
diff --git a/plugins/repo/main.mk.in b/plugins/repo/main.mk.in
index 7078bb6..1ed4da6 100644
--- a/plugins/repo/main.mk.in
+++ b/plugins/repo/main.mk.in
@@ -20,29 +20,6 @@ ver=0.8r61
# 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)
@@ -79,18 +56,6 @@ 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 := @
@@ -103,6 +68,6 @@ $(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir)
-e 's/$bID@/$(subst /,\/,$(id))/g' \
$@
-$(dirs) $(libexecdir)/$(rvs) $(myoutdir) :
+$(libexecdir)/$(rvs) $(myoutdir) :
$(MKDIR) $@
diff --git a/plugins/users/main.mk.in b/plugins/users/main.mk.in
index 0ac9cf5..71cc305 100644
--- a/plugins/users/main.mk.in
+++ b/plugins/users/main.mk.in
@@ -19,30 +19,7 @@ ver=0.8r61
# 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
+rvs = @name@
# phony targets ####################################################
all : $(name)
@@ -79,18 +56,6 @@ 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 := @
@@ -103,6 +68,6 @@ $(myoutdir)/% : $(mysrcdir)/%.sh $(myoutdir)
-e 's/$bID@/$(subst /,\/,$(id))/g' \
$@
-$(dirs) $(libexecdir)/$(rvs) $(myoutdir) :
+$(libexecdir)/$(rvs) $(myoutdir) :
$(MKDIR) $@