shithub: mc

Download patch

ref: bb2bde9cb692c50a3a2a230a68591a85c38e4f79
parent: b10b3137d2423629ee2641bf178196e243697c20
author: Ori Bernstein <ori@eigenstate.org>
date: Sat Jan 3 13:17:42 EST 2015 

Move to mbld for libdate.


--- a/lib/date/Makefile
+++ /dev/null
@@ -1,16 +1,0 @@
-MYRLIB=date
-MYRSRC= \
-	date.myr \
-	fmt.myr \
-	names.myr \
-	parse.myr \
-	types.myr \
-	zoneinfo.myr \
-
-MYRFLAG=-I .
-
-include config.mk
-include mk/myr.mk
-
-check: all
-	make -C test check
--- /dev/null
+++ b/lib/date/bldfile
@@ -1,0 +1,8 @@
+lib date =
+	date.myr
+	fmt.myr
+	names.myr
+	parse.myr
+	types.myr
+	zoneinfo.myr
+;;
--- a/lib/date/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) $(MYRFLAG) $^
-
-$(MYRBIN): $(MYRSRC) $(ASMSRC)
-	myrbuild -b $(MYRBIN) $(MYRFLAG) $^
-
-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