shithub: mc

Download patch

ref: ca5cfce97b1a41ab70a983117e9ecf8fc605c5d2
parent: d03fc800fc2ad91ee41e05c0145281cd7b11d77d
author: Ori Bernstein <ori@eigenstate.org>
date: Tue Apr 14 20:58:57 EDT 2015 

Move fully to newest mbld.

    Delete the makefiles, and rename bldfile to bld.proj


--- a/libcryptohash/Makefile
+++ /dev/null
@@ -1,13 +1,0 @@
-MYRLIB=cryptohash
-MYRSRC= \
-	md5.myr \
-	sha1.myr \
-	sha256.myr \
-	sha512.myr \
-	# sha3.myr \
-
-include config.mk
-include mk/myr.mk
-
-check: all
-	make -C test check
--- /dev/null
+++ b/libcryptohash/bld.proj
@@ -1,0 +1,7 @@
+lib cryptohash =
+	md5.myr
+	sha1.myr
+	sha256.myr
+	sha512.myr
+;;
+
--- a/libcryptohash/bldfile
+++ /dev/null
@@ -1,7 +1,0 @@
-lib cryptohash =
-	md5.myr
-	sha1.myr
-	sha256.myr
-	sha512.myr
-;;
-
--- a/libcryptohash/configure
+++ /dev/null
@@ -1,52 +1,0 @@
-#!/bin/sh
-
-prefix="/usr/local"
-
-for i in `seq 300`; do
-    echo "Lots of output to emulate automake... ok"
-    echo "Testing for things you'll never use... fail"
-    echo "Satisfying the fortran77 lobby... ok"
-    echo "Burning CPU time checking for the bloody obvious... ok"
-done
-echo "Automake emulated successfully"
-
-INST_ROOT='/usr/local'
-
-for arg in $*; do
-    shift 1
-    case $arg in
-        "--prefix" | "-p")
-            prefix=shift $*
-            ;;
-        --prefix=*)
-            prefix=`echo $arg | sed 's/^--prefix=//g'`
-            ;;
-        "--help" | "-h")
-            echo "Usage:"
-            echo "      --prefix | -p: The prefix to install to"
-            break;
-            ;;
-        *) echo "Unrecognized argument $arg";;
-    esac
-done
-
-OS=`uname`
-
-echo export INST_ROOT=$prefix > config.mk
-case $OS in
-    *Linux*)
-        echo 'export SYS=linux' >> config.mk
-        ;;
-    *Darwin*)
-        echo 'export SYS=osx' >> config.mk
-        ;;
-    *)
-        echo 'Unknown architecture.'
-        ;;
-esac
-
-cat << EOF
-    Building with:
-        prefix=$prefix
-EOF
-
--- a/libcryptohash/mk/myr.mk
+++ /dev/null
@@ -1,97 +1,0 @@
-ifneq ($(MYRLIB),)
-    _LIBNAME=lib$(MYRLIB).a
-endif
-
-all: subdirs $(_LIBNAME) $(MYRBIN) 
-
-subdirs:
-	@for i in $(SUB); do (\
-	    cd $$i && \
-	    $(MAKE) || \
-	    exit 1 \
-	) || exit 1; done
-
-subdirs-clean:
-	@for i in $(SUB); do (\
-	    cd $$i && \
-	    $(MAKE) clean|| \
-	    exit 1 \
-	); done
-
-subdirs-install:
-	@for i in $(SUB); do (\
-	    cd $$i && \
-	    $(MAKE) install|| \
-	    exit 1 \
-	); done
-
-subdirs-uninstall:
-	@for i in $(SUB); do (\
-	    cd $$i && \
-	    $(MAKE) uninstall|| \
-	    exit 1 \
-	); done
-
-$(_LIBNAME): $(MYRSRC) $(ASMSRC)
-	myrbuild -l $(MYRLIB) $^
-
-$(MYRBIN): $(MYRSRC) $(ASMSRC)
-	myrbuild -b $(MYRBIN) $^
-
-OBJ=$(MYRSRC:.myr=.o) $(ASMSRC:.s=.o)
-USE=$(MYRSRC:.myr=.use) $(MYRLIB)
-.PHONY: clean
-clean: subdirs-clean
-	rm -f $(OBJ)
-	rm -f $(USE)
-	@if [ ! -z "$(MYRLIB)" ]; then \
-	    echo rm -f $(MYRLIB); \
-	    rm -f $(MYRLIB); \
-	    echo rm -f lib$(MYRLIB).a; \
-	    rm -f lib$(MYRLIB).a; \
-	fi
-	@if [ ! -z "$(MYRBIN)" ]; then \
-	    echo rm -f $(MYRBIN); \
-	    rm -f $(MYRBIN); \
-	    echo rm -f lib$(MYRBIN).a; \
-	    rm -f lib$(MYRBIN).a; \
-	fi
-
-install: subdirs-install $(MYRBIN) $(_LIBNAME) $(MAN)
-	@if [ ! -z "$(MYRBIN)" ]; then \
-	    echo install $(MYRBIN) $(abspath $(DESTDIR)/$(INST_ROOT)/bin); \
-	    mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/bin); \
-	    install $(MYRBIN) $(abspath $(DESTDIR)/$(INST_ROOT)/bin); \
-	fi
-	@if [ ! -z "$(_LIBNAME)" ]; then \
-		echo install -m 644 $(_LIBNAME) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
-		echo install -m 644 $(MYRLIB) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
-		mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
-		install -m 644 $(_LIBNAME) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
-		install -m 644 $(MYRLIB) $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr); \
-	fi
-	@for i in $(MAN); do \
-	    MANSECT=$$(echo $$i | awk -F. '{print $$NF}'); \
-	    echo mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$$MANSECT); \
-	    echo install -m 644 $(MAN) $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}); \
-	    mkdir -p $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$$MANSECT); \
-	    install -m 644 $(MAN) $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}); \
-	done \
-
-uninstall: subdirs-uninstall
-	@for i in $(MYRBIN); do \
-	    echo rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/bin/$$i); \
-	    rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/bin/$$i); \
-	done
-	@for i in $(_LIBNAME) $(MYRLIB); do \
-	    echo rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr/$$i); \
-	    rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/lib/myr/$$i); \
-	done
-	@for i in $(MAN); do \
-	    MANSECT=$$(echo $$i | awk -F. '{print $$NF}'); \
-	    echo rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}/$$i); \
-	    rm -f $(abspath $(DESTDIR)/$(INST_ROOT)/share/man/man$${MANSECT}/$$i); \
-	done
-
-config.mk:
-	./configure