diff options
-rw-r--r-- | Makefile.orig | 58 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/commit.d.sh (renamed from source/rvs-core/commit.d) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/commit.f.sh (renamed from source/rvs-core/commit.f) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/commit.sh (renamed from source/rvs-core/commit) | 0 | ||||
-rw-r--r-- | src/rvs-core/get.d.sh (renamed from source/rvs-core/get.d) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/get.f.sh (renamed from source/rvs-core/get.f) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/get.sh (renamed from source/rvs-core/get) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/init.sh (renamed from source/rvs-core/init) | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/lib/rvsdb.sh (renamed from source/rvs-core/lib/rvsdb) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs-core/lib/stdio.sh (renamed from source/rvs-core/lib/stdio) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | src/rvs.sh (renamed from source/rvs) | 0 |
11 files changed, 25 insertions, 35 deletions
diff --git a/Makefile.orig b/Makefile.orig index a212209..67ac85f 100644 --- a/Makefile.orig +++ b/Makefile.orig @@ -13,8 +13,6 @@ RM = rm -f CP = cp MKDIR = mkdir -p -CHOWN = chown -CHMOD = chmod INSTALL = install PRE = @@pre@@ # code pre-processor @@ -26,42 +24,31 @@ libdir = $$libdir$$ sourcedir = @@sourcedir@@ # Targets ########################################################## + rvs : wrapper core +.PHONY : rvs install clean remove wrapper i-wrapper core i-core .SUFFIXES : -out/% : $(sourcedir)/source/% $(PRE) out - $(PRE) <$< > $@ +wrapper : out/rvs + +core : shellScripts -wrapper : lib out/rvs +srcFiles = $(shell find $(sourcedir)/src/rvs-core/ -type f) +outFiles = $(patsubst $(sourcedir)/src/%,out/%,${basename $(srcFiles)}) +libFiles = $(patsubst out/rvs-core/%,$(libdir)/%, $(outFiles) ) +shellScripts : $(outFiles) -#core: lib commit get init l b c d p f s -core : lib commit get init d f +# install -commit: lib out/rvs-core/commit -get: lib out/rvs-core/get -init: lib out/rvs-core/init +install : rvs i-wrapper i-core -#l: lib out/rvs-core out/rvs-core/commit.l out/rvs-core/get.l -#b: lib out/rvs-core out/rvs-core/commit.b out/rvs-core/get.b -#c: lib out/rvs-core out/rvs-core/commit.c out/rvs-core/get.c -d : lib out/rvs-core out/rvs-core/commit.d out/rvs-core/get.d -#p: lib out/rvs-core out/rvs-core/commit.p out/rvs-core/get.p -f : lib out/rvs-core out/rvs-core/commit.f out/rvs-core/get.f -#s: lib out/rvs-core out/rvs-core/commit.s out/rvs-core/get.s -#D: lib out/rvs-core out/rvs-core/commit.D out/rvs-core/get.D +i-wrapper : $(prefix)/$(bindir)/rvs -lib: out/rvs-core/lib out/rvs-core/lib/stdio out/rvs-core/lib/rvsdb -# install/clean/uninstall +i-core : $(libFiles) -install : - $(INSTALL) -m 755 -o root -g root -T out/rvs $(prefix)/$(bindir)/rvs - #$(INSTALL) -m 755 -o root -g root -d $(libdir) - #$(INSTALL) -m 755 -o root -g root -D out/rvs-core/{lib/*,*} $(libdir) - $(CP) -r out/rvs-core $(libdir) - $(CHOWN) -R root:root $(libdir) - $(CHMOD) -R 755 $(libdir) +# clean/remove clean : $(RM) -r tmp @@ -72,13 +59,16 @@ remove : $(RM) $(prefix)/$(bindir)/rvs $(RM) -r $(libdir) -# Override build instructions for directories -out: - $(MKDIR) out +# implicit rules + +out/% : $(sourcedir)/src/%.sh $(PRE) + $(MKDIR) $(dir $@) + $(PRE) <$< > $@ -out/rvs-core: out - $(MKDIR) out/rvs-core +$(prefix)/$(bindir)/% : out/% + $(INSTALL) -m 755 -o root -g root -T $< $@ -out/rvs-core/lib: out/rvs-core - $(MKDIR) out/rvs-core/lib +$(libdir)/% : out/rvs-core/% + $(INSTALL) -m 755 -o root -g root -d $(dir $@) + $(INSTALL) -m 755 -o root -g root -T $< $@ diff --git a/source/rvs-core/commit.d b/src/rvs-core/commit.d.sh index 5a47614..5a47614 100755..100644 --- a/source/rvs-core/commit.d +++ b/src/rvs-core/commit.d.sh diff --git a/source/rvs-core/commit.f b/src/rvs-core/commit.f.sh index cd8070b..cd8070b 100755..100644 --- a/source/rvs-core/commit.f +++ b/src/rvs-core/commit.f.sh diff --git a/source/rvs-core/commit b/src/rvs-core/commit.sh index 2f120e0..2f120e0 100755..100644 --- a/source/rvs-core/commit +++ b/src/rvs-core/commit.sh diff --git a/source/rvs-core/get.d b/src/rvs-core/get.d.sh index dcd78e8..dcd78e8 100644 --- a/source/rvs-core/get.d +++ b/src/rvs-core/get.d.sh diff --git a/source/rvs-core/get.f b/src/rvs-core/get.f.sh index 9e4cec7..9e4cec7 100755..100644 --- a/source/rvs-core/get.f +++ b/src/rvs-core/get.f.sh diff --git a/source/rvs-core/get b/src/rvs-core/get.sh index c1a2469..c1a2469 100755..100644 --- a/source/rvs-core/get +++ b/src/rvs-core/get.sh diff --git a/source/rvs-core/init b/src/rvs-core/init.sh index c0b5980..cfd269f 100755..100644 --- a/source/rvs-core/init +++ b/src/rvs-core/init.sh @@ -14,5 +14,5 @@ usage='[OPTIONS]' source "`rvs -d`/lib/stdio" source "`rvs -d`/lib/rvsdb" -mkdir -p "$repo/{files/tmp}" +mkdir -p "$repo/{files,tmp}" diff --git a/source/rvs-core/lib/rvsdb b/src/rvs-core/lib/rvsdb.sh index 3ced573..3ced573 100755..100644 --- a/source/rvs-core/lib/rvsdb +++ b/src/rvs-core/lib/rvsdb.sh diff --git a/source/rvs-core/lib/stdio b/src/rvs-core/lib/stdio.sh index aff22f1..aff22f1 100755..100644 --- a/source/rvs-core/lib/stdio +++ b/src/rvs-core/lib/stdio.sh diff --git a/source/rvs b/src/rvs.sh index 518f487..518f487 100755..100644 --- a/source/rvs +++ b/src/rvs.sh |